Merge tag 'v3.0.73' into v3.0-rt

This is the 3.0.73 stable release

Conflicts:
	include/linux/preempt.h

Fixed with:

diff --cc include/linux/preempt.h
index 11412d7,d309dcb..0000000
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@@ -90,16 -82,20 +90,22 @@@ do {

  #else

- #define preempt_disable()             do { } while (0)
- #define __preempt_enable_no_resched() do { } while (0)
- #define preempt_enable_no_resched()   do { } while (0)
- #define preempt_enable()              do { } while (0)
- #define preempt_check_resched()               do { } while (0)
- #define preempt_check_resched_rt()    do { } while (0)
-
- #define preempt_disable_notrace()             do { } while (0)
- #define preempt_enable_no_resched_notrace()   do { } while (0)
- #define preempt_enable_notrace()              do { } while (0)
+ /*
+  * Even if we don't have any preemption, we need preempt
disable/enable
+  * to be barriers, so that we don't have things like get_user/put_user
+  * that can cause faults and scheduling migrate into our
preempt-protected
+  * region.
+  */
+ #define preempt_disable()             barrier()
++#define __preempt_enable_no_resched() barrier()
+ #define preempt_enable_no_resched()   barrier()
+ #define preempt_enable()              barrier()
+ #define preempt_check_resched()               barrier()
++#define preempt_check_resched_rt()    barrier()
+
+ #define preempt_disable_notrace()             barrier()
+ #define preempt_enable_no_resched_notrace()   barrier()
+ #define preempt_enable_notrace()              barrier()

  #endif

0 files changed, 0 insertions, 0 deletions