Merge branch 'linus' into x86/xen

diff --combined include/linux/kernel.h
index 7889c2f9b75d7a37eb0bcc9615a7107871b5d997,2651f805ba6d771b9ec1f26078609aebdb198853..75d81f157d2edbd7a8aec39ce3cb7cc3bd69a758
--- 1/include/linux/kernel.h
--- 2/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -75,6 -75,12 +75,12 @@@ extern const char linux_proc_banner[]
   */
  #define upper_32_bits(n) ((u32)(((n) >> 16) >> 16))
  
+ /**
+  * lower_32_bits - return bits 0-31 of a number
+  * @n: the number we're accessing
+  */
+ #define lower_32_bits(n) ((u32)(n))
+ 
  #define       KERN_EMERG      "<0>"   /* system is unusable                   */
  #define       KERN_ALERT      "<1>"   /* action must be taken immediately     */
  #define       KERN_CRIT       "<2>"   /* critical conditions                  */
@@@ -102,6 -108,13 +108,13 @@@ struct completion
  struct pt_regs;
  struct user;
  
+ #ifdef CONFIG_PREEMPT_VOLUNTARY
+ extern int _cond_resched(void);
+ # define might_resched() _cond_resched()
+ #else
+ # define might_resched() do { } while (0)
+ #endif
+ 
  /**
   * might_sleep - annotation for functions that can sleep
   *
@@@ -112,13 -125,6 +125,6 @@@
   * be bitten later when the calling function happens to sleep when it is not
   * supposed to.
   */
- #ifdef CONFIG_PREEMPT_VOLUNTARY
- extern int _cond_resched(void);
- # define might_resched() _cond_resched()
- #else
- # define might_resched() do { } while (0)
- #endif
- 
  #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
    void __might_sleep(char *file, int line);
  # define might_sleep() \
@@@ -176,7 -182,7 +182,7 @@@ extern int vsscanf(const char *, const 
  
  extern int get_option(char **str, int *pint);
  extern char *get_options(const char *str, int nints, int *ints);
 -extern unsigned long long memparse(char *ptr, char **retptr);
 +extern unsigned long long memparse(const char *ptr, char **retptr);
  
  extern int core_kernel_text(unsigned long addr);
  extern int __kernel_text_address(unsigned long addr);