diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:20:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:20:12 -0500 |
| commit | c6329f4df2263ab5a40601a5236639e61b682f51 (patch) | |
| tree | 1ae9f8a5d65c8fcb87bf13c82ff09df641c3d418 | |
| parent | 2bd0fa3b62e8565a80f9535e0f2bd51bba46213f (diff) | |
| parent | 65ab592dc5b34caebabfe1340e7c18f52a785079 (diff) | |
| download | op-kernel-dev-c6329f4df2263ab5a40601a5236639e61b682f51.zip op-kernel-dev-c6329f4df2263ab5a40601a5236639e61b682f51.tar.gz | |
Merge branch 'master'
| -rw-r--r-- | drivers/net/skge.c | 2 | ||||
| -rw-r--r-- | include/asm-ia64/sal.h | 3 | ||||
| -rw-r--r-- | init/Kconfig | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 8b6e2a1..00d6830 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -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 (!netif_stopped(dev)) { + if (!netif_queue_stopped(dev)) { netif_stop_queue(dev); printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h index 29df88bd..313cad0 100644 --- a/include/asm-ia64/sal.h +++ b/include/asm-ia64/sal.h @@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { typedef struct sal_log_record_header { u64 id; /* Unique monotonically increasing ID */ 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 */ sal_log_timestamp_t timestamp; /* Timestamp */ efi_guid_t platform_guid; /* Unique OEM Platform ID */ diff --git a/init/Kconfig b/init/Kconfig index ea097e0..be74adb 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -206,7 +206,7 @@ config HOTPLUG outside the kernel tree does. Such modules require Y here. config KOBJECT_UEVENT - bool "Kernel Userspace Events" + bool "Kernel Userspace Events" if EMBEDDED depends on NET default y help @@ -339,7 +339,7 @@ config EPOLL support for epoll family of system calls. config CC_OPTIMIZE_FOR_SIZE - bool "Optimize for size" if EMBEDDED + bool "Optimize for size" default y if ARM || H8300 help Enabling this option will pass "-Os" instead of "-O2" to gcc |
