Merge branch 'master'

3 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 8b6e2a11e28d..00d683063c01 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 29df88bdd2bc..313cad0628d0 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 ea097e0a9c02..be74adb389ea 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