From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 7 Dec 2006 16:59:11 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
X-Git-Tag: v2.6.20-rc1~145^2^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4522d58275f124105819723e24e912c8e5bf3cdd;p=linux-2.6

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: (156 commits)
  [PATCH] x86-64: Export smp_call_function_single
  [PATCH] i386: Clean up smp_tune_scheduling()
  [PATCH] unwinder: move .eh_frame to RODATA
  [PATCH] unwinder: fully support linker generated .eh_frame_hdr section
  [PATCH] x86-64: don't use set_irq_regs()
  [PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq
  [PATCH] x86-64: Make ix86 default to HIGHMEM4G instead of NOHIGHMEM
  [PATCH] i386: replace kmalloc+memset with kzalloc
  [PATCH] x86-64: remove remaining pc98 code
  [PATCH] x86-64: remove unused variable
  [PATCH] x86-64: Fix constraints in atomic_add_return()
  [PATCH] x86-64: fix asm constraints in i386 atomic_add_return
  [PATCH] x86-64: Correct documentation for bzImage protocol v2.05
  [PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code
  [PATCH] x86-64: Fix numaq build error
  [PATCH] x86-64: include/asm-x86_64/cpufeature.h isn't a userspace header
  [PATCH] unwinder: Add debugging output to the Dwarf2 unwinder
  [PATCH] x86-64: Clarify error message in GART code
  [PATCH] x86-64: Fix interrupt race in idle callback (3rd try)
  [PATCH] x86-64: Remove unwind stack pointer alignment forcing again
  ...

Fixed conflict in include/linux/uaccess.h manually

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

4522d58275f124105819723e24e912c8e5bf3cdd
diff --cc include/linux/uaccess.h
index 76c3fe3251,65a68da8bd..975c963e57
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@@ -74,13 -34,10 +74,13 @@@ static inline unsigned long __copy_from
  #define probe_kernel_address(addr, retval)		\
  	({						\
  		long ret;				\
 +		mm_segment_t old_fs = get_fs();		\
  							\
 -		inc_preempt_count();			\
 -		ret = __get_user(retval, (__force typeof(*addr) __user *)addr);\
 -		dec_preempt_count();			\
 +		set_fs(KERNEL_DS);			\
 +		pagefault_disable();			\
- 		ret = __get_user(retval, addr);		\
++		ret = __get_user(retval, (__force typeof(retval) __user *)(addr));		\
 +		pagefault_enable();			\
 +		set_fs(old_fs);				\
  		ret;					\
  	})