lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Jeff Garzik
2005-12-13 22:20:12 -05:00
parent 2bd0fa3b62 65ab592dc5
commit c6329f4df2
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/skge.c
View File

@@ -2280,7 +2280,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
} }
if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
if (!netif_stopped(dev)) { if (!netif_queue_stopped(dev)) {
netif_stop_queue(dev); netif_stop_queue(dev);
printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",

3
include/asm-ia64/sal.h
View File

@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp {
typedef struct sal_log_record_header { typedef struct sal_log_record_header {
u64 id; /* Unique monotonically increasing ID */ u64 id; /* Unique monotonically increasing ID */
sal_log_revision_t revision; /* Major and Minor revision of header */ sal_log_revision_t revision; /* Major and Minor revision of header */
u16 severity; /* Error Severity */ u8 severity; /* Error Severity */
u8 validation_bits; /* 0: platform_guid, 1: !timestamp */
u32 len; /* Length of this error log in bytes */ u32 len; /* Length of this error log in bytes */
sal_log_timestamp_t timestamp; /* Timestamp */ sal_log_timestamp_t timestamp; /* Timestamp */
efi_guid_t platform_guid; /* Unique OEM Platform ID */ efi_guid_t platform_guid; /* Unique OEM Platform ID */

4
init/Kconfig
View File

@@ -206,7 +206,7 @@ config HOTPLUG
outside the kernel tree does. Such modules require Y here. outside the kernel tree does. Such modules require Y here.
config KOBJECT_UEVENT config KOBJECT_UEVENT
bool "Kernel Userspace Events" bool "Kernel Userspace Events" if EMBEDDED
depends on NET depends on NET
default y default y
help help
@@ -339,7 +339,7 @@ config EPOLL
support for epoll family of system calls. support for epoll family of system calls.
config CC_OPTIMIZE_FOR_SIZE config CC_OPTIMIZE_FOR_SIZE
bool "Optimize for size" if EMBEDDED bool "Optimize for size"
default y if ARM || H8300 default y if ARM || H8300
help help
Enabling this option will pass "-Os" instead of "-O2" to gcc Enabling this option will pass "-Os" instead of "-O2" to gcc