Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

9 files changed, 24 insertions, 16 deletions

diff --git a/include/asm-avr32/bug.h b/include/asm-avr32/bug.h
index afdcd79a2966..331d45bab18f 100644
--- a/include/asm-avr32/bug.h
+++ b/include/asm-avr32/bug.h
@@ -57,7 +57,7 @@
 
 #define WARN_ON(condition)                                                      \
         ({                                                              \
-                typeof(condition) __ret_warn_on = (condition);          \
+                int __ret_warn_on = !!(condition);                      \
                 if (unlikely(__ret_warn_on))                            \
                         _BUG_OR_WARN(BUGFLAG_WARNING);                  \
                 unlikely(__ret_warn_on);                                \
diff --git a/include/asm-frv/mb86943a.h b/include/asm-frv/mb86943a.h
index b89fd0b56bb3..e87ef924bfb4 100644
--- a/include/asm-frv/mb86943a.h
+++ b/include/asm-frv/mb86943a.h
@@ -36,4 +36,7 @@
 #define __reg_MB86943_pci_sl_io_base    *(volatile uint32_t *) (__region_CS1 + 0x70)
 #define __reg_MB86943_pci_sl_mem_base   *(volatile uint32_t *) (__region_CS1 + 0x78)
 
+#define __reg_MB86943_pci_arbiter       *(volatile uint32_t *) (__region_CS2 + 0x01300014)
+#define MB86943_PCIARB_EN               0x00000001
+
 #endif /* _ASM_MB86943A_H */
diff --git a/include/asm-parisc/bug.h b/include/asm-parisc/bug.h
index 83ba510ed5d8..8cfc553fc837 100644
--- a/include/asm-parisc/bug.h
+++ b/include/asm-parisc/bug.h
@@ -74,7 +74,7 @@
 
 
 #define WARN_ON(x) ({                                           \
-        typeof(x) __ret_warn_on = (x);                          \
+        int __ret_warn_on = !!(x);                              \
         if (__builtin_constant_p(__ret_warn_on)) {              \
                 if (__ret_warn_on)                              \
                         __WARN();                               \
diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index 838684dc6d35..384e3621e341 100644
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -50,7 +50,7 @@
 #define BUG()   __EMIT_BUG(0)
 
 #define WARN_ON(x) ({                                   \
-        typeof(x) __ret_warn_on = (x);                  \
+        int __ret_warn_on = !!(x);                      \
         if (__builtin_constant_p(__ret_warn_on)) {      \
                 if (__ret_warn_on)                      \
                         __EMIT_BUG(BUGFLAG_WARNING);    \
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index 46f925c815ac..a78d482e8b2f 100644
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -61,7 +61,7 @@ do {							\
 } while (0)
 
 #define WARN_ON(x) ({                                           \
-        typeof(x) __ret_warn_on = (x);                          \
+        int __ret_warn_on = !!(x);                              \
         if (__builtin_constant_p(__ret_warn_on)) {              \
                 if (__ret_warn_on)                              \
                         __WARN();                               \
diff --git a/include/linux/pci.h b/include/linux/pci.h
index d8f8a3a96644..e7d8d4e19a53 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -534,7 +534,7 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val
 
 int __must_check pci_enable_device(struct pci_dev *dev);
 int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
-int __must_check __pci_reenable_device(struct pci_dev *);
+int __must_check pci_reenable_device(struct pci_dev *);
 int __must_check pcim_enable_device(struct pci_dev *pdev);
 void pcim_pin_device(struct pci_dev *pdev);
 
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2e490271acf6..17249fae5014 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -734,7 +734,6 @@ struct sched_domain {
         unsigned long max_interval;     /* Maximum balance interval ms */
         unsigned int busy_factor;       /* less balancing by factor if busy */
         unsigned int imbalance_pct;     /* No balance until over watermark */
-        unsigned long long cache_hot_time; /* Task considered cache hot (ns) */
         unsigned int cache_nice_tries;  /* Leave cache hot tasks for # tries */
         unsigned int busy_idx;
         unsigned int idle_idx;
@@ -875,7 +874,7 @@ struct sched_class {
 
         void (*set_curr_task) (struct rq *rq);
         void (*task_tick) (struct rq *rq, struct task_struct *p);
-        void (*task_new) (struct rq *rq, struct task_struct *p);
+        void (*task_new) (struct rq *rq, struct task_struct *p, u64 now);
 };
 
 struct load_weight {
@@ -905,23 +904,28 @@ struct sched_entity {
         struct rb_node          run_node;
         unsigned int            on_rq;
 
+        u64                     exec_start;
+        u64                     sum_exec_runtime;
         u64                     wait_start_fair;
+        u64                     sleep_start_fair;
+
+#ifdef CONFIG_SCHEDSTATS
         u64                     wait_start;
-        u64                     exec_start;
+        u64                     wait_max;
+        s64                     sum_wait_runtime;
+
         u64                     sleep_start;
-        u64                     sleep_start_fair;
-        u64                     block_start;
         u64                     sleep_max;
+        s64                     sum_sleep_runtime;
+
+        u64                     block_start;
         u64                     block_max;
         u64                     exec_max;
-        u64                     wait_max;
-        u64                     last_ran;
 
-        u64                     sum_exec_runtime;
-        s64                     sum_wait_runtime;
-        s64                     sum_sleep_runtime;
         unsigned long           wait_runtime_overruns;
         unsigned long           wait_runtime_underruns;
+#endif
+
 #ifdef CONFIG_FAIR_GROUP_SCHED
         struct sched_entity     *parent;
         /* rq on which this entity is (to be) queued: */
diff --git a/include/linux/topology.h b/include/linux/topology.h
index d0890a7e5bab..525d437b1253 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -185,7 +185,6 @@
         .max_interval           = 64*num_online_cpus(), \
         .busy_factor            = 128,                  \
         .imbalance_pct          = 133,                  \
-        .cache_hot_time         = (10*1000000),         \
         .cache_nice_tries       = 1,                    \
         .busy_idx               = 3,                    \
         .idle_idx               = 3,                    \
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index ffbc7f28335a..2e5b2f6f9fa0 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -132,6 +132,8 @@ struct netlbl_lsm_secattr_catmap {
 #define NETLBL_SECATTR_CACHE            0x00000002
 #define NETLBL_SECATTR_MLS_LVL          0x00000004
 #define NETLBL_SECATTR_MLS_CAT          0x00000008
+#define NETLBL_SECATTR_CACHEABLE        (NETLBL_SECATTR_MLS_LVL | \
+                                         NETLBL_SECATTR_MLS_CAT)
 struct netlbl_lsm_secattr {
         u32 flags;