From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 5 May 2007 21:55:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
X-Git-Tag: v2.6.22-rc1~1011
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ea62ccd00fd0b6720b033adfc9984f31130ce195;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (231 commits)
  [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall
  [PATCH] i386: type may be unused
  [PATCH] i386: Some additional chipset register values validation.
  [PATCH] i386: Add missing !X86_PAE dependincy to the 2G/2G split.
  [PATCH] x86-64: Don't exclude asm-offsets.c in Documentation/dontdiff
  [PATCH] i386: avoid redundant preempt_disable in __unlazy_fpu
  [PATCH] i386: white space fixes in i387.h
  [PATCH] i386: Drop noisy e820 debugging printks
  [PATCH] x86-64: Fix allnoconfig error in genapic_flat.c
  [PATCH] x86-64: Shut up warnings for vfat compat ioctls on other file systems
  [PATCH] x86-64: Share identical video.S between i386 and x86-64
  [PATCH] x86-64: Remove CONFIG_REORDER
  [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
  [PATCH] i386: Remove copy_*_user BUG_ONs for (size < 0)
  [PATCH] i386: Little cleanups in smpboot.c
  [PATCH] x86-64: Don't enable NUMA for a single node in K8 NUMA scanning
  [PATCH] x86: Use RDTSCP for synchronous get_cycles if possible
  [PATCH] i386: Add X86_FEATURE_RDTSCP
  [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
  [PATCH] i386: Implement alternative_io for i386
  ...

Fix up trivial conflict in include/linux/highmem.h manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

ea62ccd00fd0b6720b033adfc9984f31130ce195
diff --cc include/linux/highmem.h
index 7bab8eae234,bca8e2dfa35..a515eb0afdf
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@@ -42,13 -44,9 +44,14 @@@ static inline void *kmap(struct page *p
  
  #define kunmap(page) do { (void) (page); } while (0)
  
 -#define kmap_atomic(page, idx) \
 -	({ pagefault_disable(); page_address(page); })
 +#include <asm/kmap_types.h>
 +
 +static inline void *kmap_atomic(struct page *page, enum km_type idx)
 +{
 +	pagefault_disable();
 +	return page_address(page);
 +}
+ #define kmap_atomic_prot(page, idx, prot)	kmap_atomic(page, idx)
  
  #define kunmap_atomic(addr, idx)	do { pagefault_enable(); } while (0)
  #define kmap_atomic_pfn(pfn, idx)	kmap_atomic(pfn_to_page(pfn), (idx))
diff --cc kernel/power/power.h
index 5f842c3efc4,1c6eef8df4a..33bd94ceba3
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@@ -35,11 -37,8 +37,8 @@@ static struct subsys_attribute _name##_
  	.store	= _name##_store,		\
  }
  
 -extern struct subsystem power_subsys;
 +extern struct kset power_subsys;
  
- /* References to section boundaries */
- extern const void __nosave_begin, __nosave_end;
- 
  /* Preferred image size in bytes (default 500 MB) */
  extern unsigned long image_size;
  extern int in_suspend;