[kernel] r19079 - dists/sid/linux/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Mon Jun  4 00:28:29 2012
New Revision: 19079

Log:
Refresh another patch that has fuzz

Modified:
   dists/sid/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch

Modified: dists/sid/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch	Mon Jun  4 00:11:03 2012	(r19078)
+++ dists/sid/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch	Mon Jun  4 00:28:29 2012	(r19079)
@@ -19,7 +19,7 @@
 ---
 --- a/arch/frv/Kconfig
 +++ b/arch/frv/Kconfig
-@@ -8,6 +8,7 @@ config FRV
+@@ -8,6 +8,7 @@
  	select HAVE_GENERIC_HARDIRQS
  	select GENERIC_IRQ_SHOW
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
@@ -29,7 +29,7 @@
  	bool
 --- a/arch/h8300/Kconfig
 +++ b/arch/h8300/Kconfig
-@@ -4,6 +4,7 @@ config H8300
+@@ -4,6 +4,7 @@
  	select HAVE_IDE
  	select HAVE_GENERIC_HARDIRQS
  	select GENERIC_IRQ_SHOW
@@ -39,7 +39,7 @@
  	string
 --- a/arch/m68k/Kconfig
 +++ b/arch/m68k/Kconfig
-@@ -6,6 +6,7 @@ config M68K
+@@ -7,6 +7,7 @@
  	select HAVE_GENERIC_HARDIRQS
  	select GENERIC_IRQ_SHOW
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
@@ -49,7 +49,7 @@
  	bool
 --- a/arch/microblaze/Kconfig
 +++ b/arch/microblaze/Kconfig
-@@ -17,6 +17,7 @@ config MICROBLAZE
+@@ -17,6 +17,7 @@
  	select HAVE_GENERIC_HARDIRQS
  	select GENERIC_IRQ_PROBE
  	select GENERIC_IRQ_SHOW
@@ -59,7 +59,7 @@
  	def_bool n
 --- a/arch/openrisc/Kconfig
 +++ b/arch/openrisc/Kconfig
-@@ -15,6 +15,7 @@ config OPENRISC
+@@ -15,6 +15,7 @@
  	select GENERIC_IRQ_PROBE
  	select GENERIC_IRQ_SHOW
  	select GENERIC_IOMAP
@@ -69,7 +69,7 @@
  	def_bool y
 --- a/arch/score/Kconfig
 +++ b/arch/score/Kconfig
-@@ -4,6 +4,7 @@ config SCORE
+@@ -4,6 +4,7 @@
         def_bool y
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
@@ -79,7 +79,7 @@
  	prompt "System type"
 --- a/arch/um/Kconfig.common
 +++ b/arch/um/Kconfig.common
-@@ -8,6 +8,7 @@ config UML
+@@ -8,6 +8,7 @@
  	default y
  	select HAVE_GENERIC_HARDIRQS
  	select GENERIC_IRQ_SHOW
@@ -89,7 +89,7 @@
  	bool
 --- a/arch/xtensa/Kconfig
 +++ b/arch/xtensa/Kconfig
-@@ -9,6 +9,7 @@ config XTENSA
+@@ -9,6 +9,7 @@
  	select HAVE_IDE
  	select HAVE_GENERIC_HARDIRQS
  	select GENERIC_IRQ_SHOW
@@ -99,7 +99,7 @@
  	  primarily for embedded systems.  These processors are both
 --- a/drivers/base/Kconfig
 +++ b/drivers/base/Kconfig
-@@ -172,6 +172,10 @@ config SYS_HYPERVISOR
+@@ -172,6 +172,10 @@
  	bool
  	default n
  
@@ -109,7 +109,7 @@
 +
  source "drivers/base/regmap/Kconfig"
  
- config DMA_SHARED_BUFFER
+ endmenu
 --- a/drivers/base/cpu.c
 +++ b/drivers/base/cpu.c
 @@ -12,6 +12,7 @@
@@ -120,7 +120,7 @@
  
  #include "base.h"
  
-@@ -248,11 +249,29 @@ bool cpu_is_hotpluggable(unsigned cpu)
+@@ -248,11 +249,29 @@
  }
  EXPORT_SYMBOL_GPL(get_cpu_sysdev);