9 files changed, 47 insertions, 97 deletions

diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h
index ef0671e5d5..43e5bd8f4a 100644
--- a/include/asm-i386/mach-summit/mach_apic.h
+++ b/include/asm-i386/mach-summit/mach_apic.h
@@ -88,7 +88,11 @@ static inline void clustered_apic_check(void)
 
 static inline int apicid_to_node(int logical_apicid)
 {
+#ifdef CONFIG_SMP
         return apicid_2_node[hard_smp_processor_id()];
+#else
+        return 0;
+#endif
 }
 
 /* Mapping from cpu number to logical apicid */
diff --git a/include/asm-parisc/semaphore.h b/include/asm-parisc/semaphore.h
index c9ee41cd07..d45827a21f 100644
--- a/include/asm-parisc/semaphore.h
+++ b/include/asm-parisc/semaphore.h
@@ -115,7 +115,8 @@ extern __inline__ int down_interruptible(struct semaphore * sem)
  */
 extern __inline__ int down_trylock(struct semaphore * sem)
 {
-        int flags, count;
+        unsigned long flags;
+        int count;
 
         spin_lock_irqsave(&sem->sentry, flags);
         count = sem->count - 1;
@@ -131,7 +132,8 @@ extern __inline__ int down_trylock(struct semaphore * sem)
  */
 extern __inline__ void up(struct semaphore * sem)
 {
-        int flags;
+        unsigned long flags;
+
         spin_lock_irqsave(&sem->sentry, flags);
         if (sem->count < 0) {
                 __up(sem);
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 4fe740bf4e..412e025bc5 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -11,12 +11,6 @@
 #ifndef _LINUX_TRACE_IRQFLAGS_H
 #define _LINUX_TRACE_IRQFLAGS_H
 
-#define BUILD_CHECK_IRQ_FLAGS(flags)                                    \
-        do {                                                            \
-                BUILD_BUG_ON(sizeof(flags) != sizeof(unsigned long));   \
-                typecheck(unsigned long, flags);                        \
-        } while (0)
-
 #ifdef CONFIG_TRACE_IRQFLAGS
   extern void trace_hardirqs_on(void);
   extern void trace_hardirqs_off(void);
@@ -56,15 +50,10 @@
 #define local_irq_disable() \
         do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)
 #define local_irq_save(flags) \
-        do {                                    \
-                BUILD_CHECK_IRQ_FLAGS(flags);   \
-                raw_local_irq_save(flags);      \
-                trace_hardirqs_off();           \
-        } while (0)
+        do { raw_local_irq_save(flags); trace_hardirqs_off(); } while (0)
 
 #define local_irq_restore(flags)                                \
         do {                                                    \
-                BUILD_CHECK_IRQ_FLAGS(flags);                   \
                 if (raw_irqs_disabled_flags(flags)) {           \
                         raw_local_irq_restore(flags);           \
                         trace_hardirqs_off();                   \
@@ -80,16 +69,8 @@
  */
 # define raw_local_irq_disable()        local_irq_disable()
 # define raw_local_irq_enable()         local_irq_enable()
-# define raw_local_irq_save(flags)              \
-        do {                                    \
-                BUILD_CHECK_IRQ_FLAGS(flags);   \
-                local_irq_save(flags);          \
-        } while (0)
-# define raw_local_irq_restore(flags)           \
-        do {                                    \
-                BUILD_CHECK_IRQ_FLAGS(flags);   \
-                local_irq_restore(flags);       \
-        } while (0)
+# define raw_local_irq_save(flags)      local_irq_save(flags)
+# define raw_local_irq_restore(flags)   local_irq_restore(flags)
 #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
 
 #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
@@ -99,11 +80,7 @@
                 raw_safe_halt();                                \
         } while (0)
 
-#define local_save_flags(flags)                 \
-        do {                                    \
-                BUILD_CHECK_IRQ_FLAGS(flags);   \
-                raw_local_save_flags(flags);    \
-        } while (0)
+#define local_save_flags(flags)         raw_local_save_flags(flags)
 
 #define irqs_disabled()                                         \
 ({                                                              \
@@ -113,11 +90,7 @@
         raw_irqs_disabled_flags(flags);                         \
 })
 
-#define irqs_disabled_flags(flags)      \
-({                                      \
-        BUILD_CHECK_IRQ_FLAGS(flags);   \
-        raw_irqs_disabled_flags(flags); \
-})
+#define irqs_disabled_flags(flags)      raw_irqs_disabled_flags(flags)
 #endif          /* CONFIG_X86 */
 
 #endif
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 24b611147a..b9b5e4ba16 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -30,8 +30,10 @@ extern const char linux_banner[];
 
 #define STACK_MAGIC     0xdeadbeef
 
+#define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1)
+#define __ALIGN_MASK(x,mask)    (((x)+(mask))&~(mask))
+
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#define ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL))
 #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
 #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9264139bd8..83b8c4f1d6 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -93,8 +93,10 @@ struct netpoll_info;
 #endif
 #endif
 
-#if !defined(CONFIG_NET_IPIP) && \
-    !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)
+#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \
+    !defined(CONFIG_NET_IPGRE) &&  !defined(CONFIG_NET_IPGRE_MODULE) && \
+    !defined(CONFIG_IPV6_SIT) && !defined(CONFIG_IPV6_SIT_MODULE) && \
+    !defined(CONFIG_IPV6_TUNNEL) && !defined(CONFIG_IPV6_TUNNEL_MODULE)
 #define MAX_HEADER LL_MAX_HEADER
 #else
 #define MAX_HEADER (LL_MAX_HEADER + 48)
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 57f670d78f..8451052ca6 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -52,7 +52,6 @@
 #include <linux/thread_info.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
-#include <linux/irqflags.h>
 
 #include <asm/system.h>
 
@@ -184,52 +183,24 @@ do {								\
 #define read_lock(lock)                 _read_lock(lock)
 
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-#define spin_lock_irqsave(lock, flags)                  \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                flags = _spin_lock_irqsave(lock);       \
-        } while (0)
-#define read_lock_irqsave(lock, flags)                  \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                flags = _read_lock_irqsave(lock);       \
-        } while (0)
-#define write_lock_irqsave(lock, flags)                 \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                flags = _write_lock_irqsave(lock);      \
-        } while (0)
+
+#define spin_lock_irqsave(lock, flags)  flags = _spin_lock_irqsave(lock)
+#define read_lock_irqsave(lock, flags)  flags = _read_lock_irqsave(lock)
+#define write_lock_irqsave(lock, flags) flags = _write_lock_irqsave(lock)
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
-#define spin_lock_irqsave_nested(lock, flags, subclass)                 \
-        do {                                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);                           \
-                flags = _spin_lock_irqsave_nested(lock, subclass);      \
-        } while (0)
+#define spin_lock_irqsave_nested(lock, flags, subclass) \
+        flags = _spin_lock_irqsave_nested(lock, subclass)
 #else
-#define spin_lock_irqsave_nested(lock, flags, subclass)                 \
-        do {                                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);                           \
-                flags = _spin_lock_irqsave(lock);                       \
-        } while (0)
+#define spin_lock_irqsave_nested(lock, flags, subclass) \
+        flags = _spin_lock_irqsave(lock)
 #endif
 
 #else
-#define spin_lock_irqsave(lock, flags)                  \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                _spin_lock_irqsave(lock, flags);        \
-        } while (0)
-#define read_lock_irqsave(lock, flags)                  \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                _read_lock_irqsave(lock, flags);        \
-        } while (0)
-#define write_lock_irqsave(lock, flags)                 \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                _write_lock_irqsave(lock, flags);       \
-        } while (0)
+
+#define spin_lock_irqsave(lock, flags)  _spin_lock_irqsave(lock, flags)
+#define read_lock_irqsave(lock, flags)  _read_lock_irqsave(lock, flags)
+#define write_lock_irqsave(lock, flags) _write_lock_irqsave(lock, flags)
 #define spin_lock_irqsave_nested(lock, flags, subclass) \
         spin_lock_irqsave(lock, flags)
 
@@ -268,24 +239,15 @@ do {								\
 #endif
 
 #define spin_unlock_irqrestore(lock, flags) \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                _spin_unlock_irqrestore(lock, flags);   \
-        } while (0)
+                                        _spin_unlock_irqrestore(lock, flags)
 #define spin_unlock_bh(lock)            _spin_unlock_bh(lock)
 
 #define read_unlock_irqrestore(lock, flags) \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                _read_unlock_irqrestore(lock, flags);   \
-        } while (0)
+                                        _read_unlock_irqrestore(lock, flags)
 #define read_unlock_bh(lock)            _read_unlock_bh(lock)
 
 #define write_unlock_irqrestore(lock, flags) \
-        do {                                            \
-                BUILD_CHECK_IRQ_FLAGS(flags);           \
-                _write_unlock_irqrestore(lock, flags);  \
-        } while (0)
+                                        _write_unlock_irqrestore(lock, flags)
 #define write_unlock_bh(lock)           _write_unlock_bh(lock)
 
 #define spin_trylock_bh(lock)   __cond_lock(lock, _spin_trylock_bh(lock))
@@ -299,7 +261,6 @@ do {								\
 
 #define spin_trylock_irqsave(lock, flags) \
 ({ \
-        BUILD_CHECK_IRQ_FLAGS(flags); \
         local_irq_save(flags); \
         spin_trylock(lock) ? \
         1 : ({ local_irq_restore(flags); 0; }); \
diff --git a/include/net/sock.h b/include/net/sock.h
index ac286a3530..9cdbae2a53 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -883,18 +883,23 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb)
 }
 
 /**
- *      sk_filter_release: Release a socket filter
- *      @rcu: rcu_head that contains the sk_filter info to remove
- *
- *      Remove a filter from a socket and release its resources.
+ *      sk_filter_rcu_free: Free a socket filter
+ *      @rcu: rcu_head that contains the sk_filter to free
  */
- 
 static inline void sk_filter_rcu_free(struct rcu_head *rcu)
 {
         struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu);
         kfree(fp);
 }
 
+/**
+ *      sk_filter_release: Release a socket filter
+ *      @sk: socket
+ *      @fp: filter to remove
+ *
+ *      Remove a filter from a socket and release its resources.
+ */
+
 static inline void sk_filter_release(struct sock *sk, struct sk_filter *fp)
 {
         unsigned int size = sk_filter_len(fp);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 9582e84016..1d77b63c5e 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -35,6 +35,7 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_transport_sas.h>
+#include <asm/scatterlist.h>
 
 struct block_device;
 
diff --git a/include/sound/version.h b/include/sound/version.h
index 52fd6879b8..17137f3a3b 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated by alsa/ksync script.  */
 #define CONFIG_SND_VERSION "1.0.13"
-#define CONFIG_SND_DATE " (Sun Oct 22 08:56:16 2006 UTC)"
+#define CONFIG_SND_DATE " (Tue Nov 28 14:07:24 2006 UTC)"