linux-next: Tree for November 28

Hi all,

Changes since 20081127:

Today's tree fails the powerpc allyesconfig build.

New tree:
trivial

Undropped trees:

Dropped trees (temporarily):
v4l-dvb (build problem)
kbuild (build problem)
semaphore-removal (due to unfixed conflicts against Linus' tree) cpu_alloc (build problem)
perfmon3 (concerns from the x86 team)

make[2]: *** No rule to make target drivers/misc/tc1100-wmi.o', needed by drivers/misc/built-in.o'.

on allmodconfig & allyesconfig for i386.

On, moved to drivers/x86/. Someone needs to clean up drivers/misc/Makefile.

Quoted 1 line

On, moved to drivers/x86/. Someone needs to clean up drivers/misc/Makefile.

Just wondering where the move to drivers/x86 was discussed, (reviewed and tested) and why the change is in the acpi tree and not the x86 tree?

I am not saying it should not be done (I haven't looked enough to have an opinion).

From 9f57b53c82091c7af2f6082d83d6fc6542e36917 Mon Sep 17 00:00:00 2001

Quoted 1 line

From 9f57b53c82091c7af2f6082d83d6fc6542e36917 Mon Sep 17 00:00:00 2001

From: Len Brown <[email protected]>
Date: Fri, 21 Nov 2008 00:57:09 -0500
Subject: [PATCH] x86: create drivers/x86/ from drivers/misc/
Organization: Intel Open Source Technology Center

Move x86 platform specific drivers from drivers/misc/ to a new home under drivers/x86/.

The community has been maintaining x86 platform specific drivers under /drivers/misc/ for a few years. The oldest ones started life under drivers/acpi, but got booted out because they are generally vendor-specific extensions to ACPI, or simply users of ACPI, rather than implementers of the ACPI spec.

The thing that they have in common is that they are x86 vendor specific platform drivers. So when asked, Linus suggested we move them to drivers/x86.

Signed-off-by Len Brown <[email protected]>

---
just the interesting part of the patch is included below, due to size.

 arch/x86/Kconfig                         |    2 +
 arch/x86/Makefile                        |    3 +
 drivers/misc/Kconfig                     |  280 ----------------------------
 drivers/misc/Makefile                    |   11 --
 drivers/x86/Kconfig                      |  290 ++++++++++++++++++++++++++++++
 drivers/x86/Makefile                     |   17 ++
 drivers/{misc => x86}/acer-wmi.c         |    0
 drivers/{misc => x86}/asus-laptop.c      |    0
 drivers/{misc => x86}/compal-laptop.c    |    0
 drivers/{misc => x86}/eeepc-laptop.c     |    0
 drivers/{misc => x86}/fujitsu-laptop.c   |    0
 drivers/{misc => x86}/hp-wmi.c           |    0
 drivers/{misc => x86}/intel_menlow.c     |    0
 drivers/{misc => x86}/msi-laptop.c       |    0
 drivers/{misc => x86}/panasonic-laptop.c |    0
 drivers/{misc => x86}/sony-laptop.c      |    0
 drivers/{misc => x86}/tc1100-wmi.c       |    0
 drivers/{misc => x86}/thinkpad_acpi.c    |    0
 18 files changed, 312 insertions(+), 291 deletions(-)

arch/x86/Kconfig +2 -0

index 93224b5..b89db1e 100644
@@ -1904,6 +1904,8 @@ source "drivers/Kconfig"
 
 source "drivers/firmware/Kconfig"
 
+source "drivers/x86/Kconfig"
+
 source "fs/Kconfig"
 
 source "arch/x86/Kconfig.debug"

arch/x86/Makefile +3 -0

index d1a47ad..a750519 100644
@@ -171,6 +171,9 @@ ifeq ($(CONFIG_X86_32),y)
 drivers-$(CONFIG_FB) += arch/x86/video/
 endif
 
+# x86 platform-specific drivers
+drivers-y       += drivers/x86/
+
 ####
 # boot loader support. Several targets are kept for legacy purposes
 

drivers/misc/Kconfig +0 -280

index fee7304..8b775b8 100644
@@ -136,97 +136,6 @@ config TIFM_7XX1
           To compile this driver as a module, choose M here: the module will
 	  be called tifm_7xx1.
 
-config ACER_WMI
-        tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
-	depends on X86
-	depends on EXPERIMENTAL
-	depends on ACPI
-	depends on LEDS_CLASS
-	depends on NEW_LEDS
-	depends on BACKLIGHT_CLASS_DEVICE
-	depends on SERIO_I8042
-	depends on RFKILL
-	select ACPI_WMI
-	---help---
-	  This is a driver for newer Acer (and Wistron) laptops. It adds
-	  wireless radio and bluetooth control, and on some laptops,
-	  exposes the mail LED and LCD backlight.
-
-	  For more information about this driver see
-	  <file:Documentation/laptops/acer-wmi.txt>
-
-	  If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
-	  here.
-
-config ASUS_LAPTOP
-        tristate "Asus Laptop Extras (EXPERIMENTAL)"
-        depends on X86
-        depends on ACPI
-	depends on EXPERIMENTAL && !ACPI_ASUS
-	depends on LEDS_CLASS
-	depends on NEW_LEDS
-	depends on BACKLIGHT_CLASS_DEVICE
-        ---help---
-	  This is the new Linux driver for Asus laptops. It may also support some
-	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
-	  standard ACPI events that go through /proc/acpi/events. It also adds
-	  support for video output switching, LCD backlight control, Bluetooth and
-	  Wlan control, and most importantly, allows you to blink those fancy LEDs.
-
-	  For more information and a userspace daemon for handling the extra
-	  buttons see <http://acpi4asus.sf.net/>.
-
-	  If you have an ACPI-compatible ASUS laptop, say Y or M here.
-
-config FUJITSU_LAPTOP
-        tristate "Fujitsu Laptop Extras"
-        depends on X86
-        depends on ACPI
-	depends on INPUT
-        depends on BACKLIGHT_CLASS_DEVICE
-        ---help---
-	  This is a driver for laptops built by Fujitsu:
-
-	    * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
-	    * Possibly other Fujitsu laptop models
-	    * Tested with S6410 and S7020
-
-	  It adds support for LCD brightness control and some hotkeys.
-
-	  If you have a Fujitsu laptop, say Y or M here.
-
-config FUJITSU_LAPTOP_DEBUG
-	bool "Verbose debug mode for Fujitsu Laptop Extras"
-	depends on FUJITSU_LAPTOP
-	default n
-	---help---
-	  Enables extra debug output from the fujitsu extras driver, at the
-	  expense of a slight increase in driver size.
-
-	  If you are not sure, say N here.
-
-config TC1100_WMI
-	tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
-	depends on X86 && !X86_64
-	depends on EXPERIMENTAL
-	depends on ACPI
-	select ACPI_WMI
-	---help---
-	  This is a driver for the WMI extensions (wireless and bluetooth power
-	  control) of the HP Compaq TC1100 tablet.
-
-config HP_WMI
-       tristate "HP WMI extras"
-       depends on ACPI_WMI
-       depends on INPUT
-       depends on RFKILL
-       help
-         Say Y here if you want to support WMI-based hotkeys on HP laptops and
-	 to read data from WMI such as docking or ambient light sensor state.
-
-         To compile this driver as a module, choose M here: the module will
-         be called hp-wmi.
-
 config ICS932S401
 	tristate "Integrated Circuits ICS932S401"
 	depends on I2C && EXPERIMENTAL

@@ -237,170 +146,6 @@ config ICS932S401
 	  This driver can also be built as a module. If so, the module
 	  will be called ics932s401.
 
-config MSI_LAPTOP
-        tristate "MSI Laptop Extras"
-        depends on X86
-        depends on ACPI
-        depends on BACKLIGHT_CLASS_DEVICE
-        ---help---
-	  This is a driver for laptops built by MSI (MICRO-STAR
-	  INTERNATIONAL):
-
-	  MSI MegaBook S270 (MS-1013)
-	  Cytron/TCM/Medion/Tchibo MD96100/SAM2000
-
-	  It adds support for Bluetooth, WLAN and LCD brightness control.
-
-	  More information about this driver is available at
-	  <http://0pointer.de/lennart/tchibo.html>.
-
-	  If you have an MSI S270 laptop, say Y or M here.
-
-config PANASONIC_LAPTOP
-	tristate "Panasonic Laptop Extras"
-	depends on X86 && INPUT && ACPI
-        depends on BACKLIGHT_CLASS_DEVICE
-	---help---
-	  This driver adds support for access to backlight control and hotkeys
-	  on Panasonic Let's Note laptops.
-
-	  If you have a Panasonic Let's note laptop (such as the R1(N variant),
-	  R2, R3, R5, T2, W2 and Y2 series), say Y.
-
-config COMPAL_LAPTOP
-	tristate "Compal Laptop Extras"
-	depends on X86
-	depends on ACPI
-	depends on BACKLIGHT_CLASS_DEVICE
-	---help---
-	  This is a driver for laptops built by Compal:
-
-	  Compal FL90/IFL90
-	  Compal FL91/IFL91
-	  Compal FL92/JFL92
-	  Compal FT00/IFT00
-
-	  It adds support for Bluetooth, WLAN and LCD brightness control.
-
-	  If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
-
-config SONY_LAPTOP
-	tristate "Sony Laptop Extras"
-	depends on X86 && ACPI
-	select BACKLIGHT_CLASS_DEVICE
-	depends on INPUT
-	  ---help---
-	  This mini-driver drives the SNC and SPIC devices present in the ACPI
-	  BIOS of the Sony Vaio laptops.
-
-	  It gives access to some extra laptop functionalities like Bluetooth,
-	  screen brightness control, Fn keys and allows powering on/off some
-	  devices.
-
-	  Read <file:Documentation/laptops/sony-laptop.txt> for more information.
-
-config SONYPI_COMPAT
-	bool "Sonypi compatibility"
-	depends on SONY_LAPTOP
-	  ---help---
-	  Build the sonypi driver compatibility code into the sony-laptop driver.
-
-config THINKPAD_ACPI
-	tristate "ThinkPad ACPI Laptop Extras"
-	depends on X86 && ACPI
-	select BACKLIGHT_LCD_SUPPORT
-	select BACKLIGHT_CLASS_DEVICE
-	select HWMON
-	select NVRAM
-	select INPUT
-	select NEW_LEDS
-	select LEDS_CLASS
-	select NET
-	select RFKILL
-	---help---
-	  This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
-	  support for Fn-Fx key combinations, Bluetooth control, video
-	  output switching, ThinkLight control, UltraBay eject and more.
-	  For more information about this driver see
-	  <file:Documentation/laptops/thinkpad-acpi.txt> and
-	  <http://ibm-acpi.sf.net/> .
-
-	  This driver was formerly known as ibm-acpi.
-
-	  If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
-
-config THINKPAD_ACPI_DEBUG
-	bool "Verbose debug mode"
-	depends on THINKPAD_ACPI
-	default n
-	---help---
-	  Enables extra debugging information, at the expense of a slightly
-	  increase in driver size.
-
-	  If you are not sure, say N here.
-
-config THINKPAD_ACPI_DOCK
-	bool "Legacy Docking Station Support"
-	depends on THINKPAD_ACPI
-	depends on ACPI_DOCK=n
-	default n
-	---help---
-	  Allows the thinkpad_acpi driver to handle docking station events.
-	  This support was made obsolete by the generic ACPI docking station
-	  support (CONFIG_ACPI_DOCK).  It will allow locking and removing the
-	  laptop from the docking station, but will not properly connect PCI
-	  devices.
-
-	  If you are not sure, say N here.
-
-config THINKPAD_ACPI_BAY
-	bool "Legacy Removable Bay Support"
-	depends on THINKPAD_ACPI
-	default y
-	---help---
-	  Allows the thinkpad_acpi driver to handle removable bays.  It will
-	  electrically disable the device in the bay, and also generate
-	  notifications when the bay lever is ejected or inserted.
-
-	  If you are not sure, say Y here.
-
-config THINKPAD_ACPI_VIDEO
-	bool "Video output control support"
-	depends on THINKPAD_ACPI
-	default y
-	---help---
-	  Allows the thinkpad_acpi driver to provide an interface to control
-	  the various video output ports.
-
-	  This feature often won't work well, depending on ThinkPad model,
-	  display state, video output devices in use, whether there is a X
-	  server running, phase of the moon, and the current mood of
-	  Schroedinger's cat.  If you can use X.org's RandR to control
-	  your ThinkPad's video output ports instead of this feature,
-	  don't think twice: do it and say N here to save some memory.
-
-	  If you are not sure, say Y here.
-
-config THINKPAD_ACPI_HOTKEY_POLL
-	bool "Support NVRAM polling for hot keys"
-	depends on THINKPAD_ACPI
-	default y
-	---help---
-	  Some thinkpad models benefit from NVRAM polling to detect a few of
-	  the hot key press events.  If you know your ThinkPad model does not
-	  need to do NVRAM polling to support any of the hot keys you use,
-	  unselecting this option will save about 1kB of memory.
-
-	  ThinkPads T40 and newer, R52 and newer, and X31 and newer are
-	  unlikely to need NVRAM polling in their latest BIOS versions.
-
-	  NVRAM polling can detect at most the following keys: ThinkPad/Access
-	  IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
-	  Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
-
-	  If you are not sure, say Y here.  The driver enables polling only if
-	  it is strictly necessary to do so.
-
 config ATMEL_SSC
 	tristate "Device driver for Atmel SSC peripheral"
 	depends on AVR32 || ARCH_AT91

@@ -413,31 +158,6 @@ config ATMEL_SSC
 
 	  If unsure, say N.
 
-config INTEL_MENLOW
-	tristate "Thermal Management driver for Intel menlow platform"
-	depends on ACPI_THERMAL
-	select THERMAL
-	depends on X86
-	---help---
-	  ACPI thermal management enhancement driver on
-	  Intel Menlow platform.
-
-	  If unsure, say N.
-
-config EEEPC_LAPTOP
-	tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
-	depends on X86
-	depends on ACPI
-	depends on BACKLIGHT_CLASS_DEVICE
-	depends on HWMON
-	depends on EXPERIMENTAL
-	depends on RFKILL
-	---help---
-	  This driver supports the Fn-Fx keys on Eee PC laptops.
-	  It also adds the ability to switch camera/wlan on/off.
-
-	  If you have an Eee PC laptop, say Y or M here.
-
 config ENCLOSURE_SERVICES
 	tristate "Enclosure Services"
 	default n

drivers/misc/Makefile +0 -6

index 817f7f5..4a62847 100644
@@ -5,15 +5,9 @@ obj- := misc.o	# Dummy rule to force built-in.o to be made
 
 obj-$(CONFIG_IBM_ASM)		+= ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/
-obj-$(CONFIG_ASUS_LAPTOP)	+= asus-laptop.o
-obj-$(CONFIG_EEEPC_LAPTOP)	+= eeepc-laptop.o
-obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o
-obj-$(CONFIG_COMPAL_LAPTOP)	+= compal-laptop.o
-obj-$(CONFIG_ACER_WMI)		+= acer-wmi.o
 obj-$(CONFIG_ATMEL_PWM)		+= atmel_pwm.o
 obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
 obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o
-obj-$(CONFIG_HP_WMI)		+= hp-wmi.o
 obj-$(CONFIG_ICS932S401)	+= ics932s401.o
 obj-$(CONFIG_TC1100_WMI)	+= tc1100-wmi.o
 obj-$(CONFIG_LKDTM)		+= lkdtm.o

@@ -21,12 +15,7 @@ obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
 obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o
 obj-$(CONFIG_PHANTOM)		+= phantom.o

Quoted 11 lines

Move x86 platform specific drivers from drivers/misc/ to a new home under drivers/x86/.

The community has been maintaining x86 platform specific drivers under /drivers/misc/ for a few years. The oldest ones started life under drivers/acpi, but got booted out because they are generally vendor-specific extensions to ACPI, or simply users of ACPI, rather than implementers of the ACPI spec.

Quoted 3 lines

The thing that they have in common is that they are x86 vendor specific platform drivers. So when asked, Linus suggested we move them to drivers/x86.

We already have 81 one directory entries under drivers/ and with patch you open up for an additional directory for each arch - not elegant.

As it is today (before this patch) the directories unider drivers/ said what the drivers was used for - which is logical.

But with this new arch specific directory it is no longer obvious is a driver should be located under say drivers/net/* or drivers/arm/* in case it is a arm specific driver.

What is wrong with the current location under misc/*?

If there is a good reason to keep them separated
follow the style of other directories under
drivers/* and introduce drivers/misc/x86.

git format-patch -M -B is your friend...

From 9f57b53c82091c7af2f6082d83d6fc6542e36917 Mon Sep 17 00:00:00 2001

Quoted 2 lines

Quoted 2 lines

Move x86 platform specific drivers from drivers/misc/ to a new home under drivers/x86/.

Quoted 3 lines

We already have 81 one directory entries under drivers/ and with patch you open up for an additional directory for each arch - not elegant.

I followed the example of drivers/s390/,
per Linus' suggestion.

The other place that seemed to suggest itself was
arch/x86/drivers/, as we already have:

arch/um/drivers/
arch/sh/drivers/
arch/cris/*/drivers/

Quoted 6 lines

As it is today (before this patch) the directories unider drivers/ said what the drivers was used for - which is logical.

But with this new arch specific directory it is no longer obvious is a driver should be located under say drivers/net/* or drivers/arm/* in case it is a arm specific driver.

Quoted 2 lines · Len Brown

Quoted 2 lines

Quoted 2 lines

Move x86 platform specific drivers from drivers/misc/ to a new home under drivers/x86/.

[...]

Quoted 7 lines

Quoted 3 lines

We already have 81 one directory entries under drivers/ and with patch you open up for an additional directory for each arch - not elegant.

I followed the example of drivers/s390/,
per Linus' suggestion.

Quoted 6 lines

The other place that seemed to suggest itself was
arch/x86/drivers/, as we already have:

arch/um/drivers/
arch/sh/drivers/
arch/cris/*/drivers/

IMHO, from a purely "tree organization" point of view, it would be best if arch-specific platform drivers were under drivers/platform/<arch>/. And arch/ be left for the core arch-specific stuff.

Whether that would work well, when arch maintenance factors are taken into account, I don't know.

Quoted 6 lines

Quoted 6 lines

As it is today (before this patch) the directories unider drivers/ said what the drivers was used for - which is logical.

But with this new arch specific directory it is no longer obvious is a driver should be located under say drivers/net/* or drivers/arm/* in case it is a arm specific driver.

drivers/platform/<arch> would help in that regard, I think.

Quoted 10 lines

Quoted 10 lines

Move x86 platform specific drivers from drivers/misc/ to a new home under drivers/x86/.

The community has been maintaining x86 platform specific drivers under /drivers/misc/ for a few years. The oldest ones started life under drivers/acpi, but got booted out because they are generally vendor-specific extensions to ACPI, or simply users of ACPI, rather than implementers of the ACPI spec.

Quoted 6 lines

Quoted 3 lines

The thing that they have in common is that they are x86 vendor specific platform drivers. So when asked, Linus suggested we move them to drivers/x86.

We already have 81 one directory entries under drivers/ and with patch you open up for an additional directory for each arch - not elegant.

I followed the example of drivers/s390/,
per Linus' suggestion.

The other place that seemed to suggest itself was
arch/x86/drivers/, as we already have:

arch/um/drivers/
arch/sh/drivers/
arch/cris/*/drivers/

Quoted 6 lines

As it is today (before this patch) the directories unider drivers/ said what the drivers was used for - which is logical.

But with this new arch specific directory it is no longer obvious is a driver should be located under say drivers/net/* or drivers/arm/* in case it is a arm specific driver.

These are vendor-specific, aka "platform specific" drivers for various x86 platforms.

Quoted 1 line

What is wrong with the current location under misc/*?

mostly that it "misc" means nothing at all... Indeed, misc should probably be deleted for this reason...

I followed the example of drivers/s390/,
per Linus' suggestion.

The other place that seemed to suggest itself was
arch/x86/drivers/, as we already have:

arch/um/drivers/
arch/sh/drivers/
arch/cris/*/drivers/

arch/x86/Makefile +9 -0

+++ b/drivers/x86/Kconfig

@@ -0,0 +1,290 @@
+#
+# X86 Platform Specific Drivers
+#
+
+menuconfig X86_PLATFORM_DEVICES
+	bool "X86 Platform devices"
+	default y
+	---help---

Comments below in case we stick to this drivers/x86 thing...

arch/x86/Kconfig source "drivers/Kconfig" · line 1909

Quoted 11 lines

arch/x86/Kconfig +2 -0

index 93224b5..b89db1e 100644
@@ -1904,6 +1904,8 @@ source "drivers/Kconfig"
 
 source "drivers/firmware/Kconfig"
 
+source "drivers/x86/Kconfig"
+
 source "fs/Kconfig"

Any chance we can have this in drivers/Kconfig?

Just wrap all of the file in an

if X86
.....
endif

So we keep all the drivers/ stuff in one Kconfig file and not spread all over.

arch/x86/Makefile ifeq ($(CONFIG_X86_32),y) · line 176

Quoted 11 lines

arch/x86/Makefile +3 -0

index d1a47ad..a750519 100644
@@ -171,6 +171,9 @@ ifeq ($(CONFIG_X86_32),y)
 drivers-$(CONFIG_FB) += arch/x86/video/
 endif
 
+# x86 platform-specific drivers
+drivers-y       += drivers/x86/
+

Can this be included in drivers/Makefile like this:

obj-$(CONFIG_X86) += x86/

Notice that parisc already do the same. (Yes they have a drivers/parisc dir).

We shall try to visit our tree in natural order when we build and such a rule breaks this.
Also it is good to keep drivers/ stuff in one place.

Quoted 10 lines

arch/x86/Makefile +9 -0

+++ b/drivers/x86/Kconfig

@@ -0,0 +1,290 @@
+#
+# X86 Platform Specific Drivers
+#
+
+menuconfig X86_PLATFORM_DEVICES
+	bool "X86 Platform devices"
+	default y
+	---help---

arch/x86/Makefile line 18

Quoted 10 lines

arch/x86/Makefile +10 -0

+	  Say Y here to get to see options for device drivers for various
+	  x86 platforms, including vendor-specific laptop extension drivers.
+	  This option alone does not add any kernel code.
+
+	  If you say N, all options in this submenu will be skipped and disabled.
+
+if X86_PLATFORM_DEVICES
+
+config ACER_WMI
+        tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"

spaces => tab

arch/x86/Makefile line 21

Quoted 3 lines

arch/x86/Makefile +3 -0

+config ASUS_LAPTOP
+        tristate "Asus Laptop Extras (EXPERIMENTAL)"
+        depends on ACPI

spaces => tab

arch/x86/Makefile line 27

Quoted 6 lines

arch/x86/Makefile +6 -0

+config FUJITSU_LAPTOP
+        tristate "Fujitsu Laptop Extras"
+        depends on ACPI
+	depends on INPUT
+        depends on BACKLIGHT_CLASS_DEVICE
+        ---help---

spaces => tab

arch/x86/Makefile line 34

Quoted 7 lines

arch/x86/Makefile +7 -0

+config HP_WMI
+       tristate "HP WMI extras"
+       depends on ACPI_WMI
+       depends on INPUT
+       depends on RFKILL
+       help
+         Say Y here if you want to support WMI-based hotkeys on HP laptops and

spaces => tab

arch/x86/Makefile line 44

Quoted 10 lines

arch/x86/Makefile +10 -0

+	 to read data from WMI such as docking or ambient light sensor state.
+
+         To compile this driver as a module, choose M here: the module will
+         be called hp-wmi.
+
+config MSI_LAPTOP
+        tristate "MSI Laptop Extras"
+        depends on ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+        ---help---

spaces => tab

drivers/x86/Makefile line 4

Quoted 10 lines

drivers/x86/Makefile new file +4 -0

new file mode 100644
index 0000000..4f14f28
@@ -0,0 +1,17 @@
+#
+# x86 Platform-Specific Drivers
+#
+obj- := x86.o	# Dummy rule to force built-in.o to be made

This is not needed. I can see divers/misc uses the same but it is bogus.

Quoted 11 lines

Any chance we can have this in drivers/Kconfig?

Just wrap all of the file in an

if X86
.....
endif

So we keep all the drivers/ stuff in one Kconfig file and not spread all over.

grep 'source "drivers"' arch/x86/Kconfig

source "drivers/acpi/Kconfig"
source "drivers/cpuidle/Kconfig"
source "drivers/idle/Kconfig"
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
source "drivers/eisa/Kconfig"
source "drivers/mca/Kconfig"
source "drivers/pcmcia/Kconfig"
source "drivers/pci/hotplug/Kconfig"
source "drivers/Kconfig"
source "drivers/firmware/Kconfig"
source "drivers/x86/Kconfig"

Are the lines above a good example, a bad example, or did I miss a nuance of the grand Kconfig design?

drivers/misc/Makefile line 6

Quoted 5 lines

#

drivers/misc/Makefile +0 -3

-obj- := misc.o	# Dummy rule to force built-in.o to be made
-
-obj-$(CONFIG_IBM_ASM)		+= ibmasm/

^^

Sam, Henrique,
I've responded to your feedback in v2, which follows.

Ingo,
this version does not touch arch/x86/

Quoted 3 lines

this version does not touch arch/x86/

the problem isnt the bits that touch arch/x86/, but that we carry these commits:

fbc2a06: Merge branch 'linus' into x86/uv
a3d732f: x86, UV: fix redundant creation of sgi_uv
7d9d1f2: sgi-xp: support getting the address of a partition's reserved page 31de5ec: sgi-xp: define xp_partition_id and xp_region_size 2525789: sgi-xp: create activate and notify gru message queues 6c1c325: sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect()

their drivers/misc impact is significant:

 drivers/misc/sgi-gru/grufault.c  |    4 +-
 drivers/misc/sgi-gru/gruprocfs.c |    1 -
 drivers/misc/sgi-xp/xp.h         |    7 +-
 drivers/misc/sgi-xp/xp_main.c    |    7 +
 drivers/misc/sgi-xp/xp_sn2.c     |   34 +++++
 drivers/misc/sgi-xp/xp_uv.c      |   70 +++++++++-
 drivers/misc/sgi-xp/xpc.h        |   12 ++
 drivers/misc/sgi-xp/xpc_sn2.c    |   15 +--
 drivers/misc/sgi-xp/xpc_uv.c     |  290 ++++++++++++++++++++++++++++++--------
 10 files changed, 368 insertions(+), 74 deletions(-)

And we'll likely get new commits in that space.

So if this is causing conflicts in linux-next then i'd suggest for you to please do this "git mv drivers/misc/ drivers/x86/" rename (with which i fully agree!) right after v2.6.29-rc1 - or near the end of the -rc1 merge window.

In any case, please keep it in a separate branch in the ACPI tree so that we can reconsider the ordering of this change in the future as well - should it cause problems.

You move 12 files but delete 11 lines.

Quoted 2 lines

You move 12 files but delete 11 lines.

obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o

was left behind by mistake.

Hi Len,

Quoted 3 lines · On Fri, 28 Nov 2008 09:55:08 -0800 Randy Dunlap <[email protected]> wrote:

make[2]: *** No rule to make target drivers/misc/tc1100-wmi.o', needed by drivers/misc/built-in.o'.

Quoted 3 lines

on allmodconfig & allyesconfig for i386.

On, moved to drivers/x86/. Someone needs to clean up drivers/misc/Makefile.

Just wondering where the move to drivers/x86 was discussed, (reviewed and tested) and why the change is in the acpi tree and not the x86 tree?

Quoted 10 lines · Stephen Rothwell

Hi Len,

Quoted 6 lines · On Fri, 28 Nov 2008 09:55:08 -0800 Randy Dunlap <[email protected]> wrote:

make[2]: *** No rule to make target drivers/misc/tc1100-wmi.o', needed by drivers/misc/built-in.o'.

on allmodconfig & allyesconfig for i386.

On, moved to drivers/x86/. Someone needs to clean up drivers/misc/Makefile.

Quoted 3 lines

Just wondering where the move to drivers/x86 was discussed, (reviewed and tested) and why the change is in the acpi tree and not the x86 tree?

it will all conflict with pending bits in the x86 tree, so i'd prefer if Len did this atomically after 2.6.29-rc1, without it having this long-term breakage effect.

Hi,

With next-2008-11-28, I was unable to mount an UDF-formatted DVD-RW:

~$ mount -oro -t udf /dev/sr0 /media/cdrom/
mount: Not a directory

There was no problem with 2.6.28-rc6.

I made a bisection:

33284bdf40f88160a154202510b27d983138c805 is first bad commit commit 33284bdf40f88160a154202510b27d983138c805

Author: Marcin Slusarz <[email protected]>
Date:   Sun Nov 16 20:52:19 2008 +0100

udf: implement mode and dmode mounting options

"dmode" allows overriding permissions of directories and "mode" allows overriding permissions of files.

Signed-off-by Marcin Slusarz <[email protected]>

Cc Jan Kara <[email protected]>

Signed-off-by Jan Kara <[email protected]>

Indeed, with this commit, I *must* use the dmode option to mount my DVD:

~$ sudo mount -oro,dmode=0755 -t udf /dev/sr0 /media/cdrom/ ~$ grep /media/cdrom /proc/mounts
/dev/scd0 /media/cdrom udf ro,mode=177777,dmode=755,utf8 0 0

~$ ls -la /media/cdrom/
total 46
drwxr-xr-x 5 root root 344 Dec 24 2007 .
drwxr-xr-x 12 root root 4096 Dec 1 00:17 ..
drwxr-xr-x 2 laurent laurent 7112 Nov 30 20:14 flexbackup
drwxr-xr-x 2 root root 40 Nov 20 2005 lost+found
drwxr-xr-x 10 laurent laurent 4548 Nov 25 2005 patches ~$ ls -la /media/cdrom/flexbackup/
total 4307946
drwxr-xr-x 2 laurent laurent 7112 Nov 30 20:14 .
drwxr-xr-x 5 root root 344 Dec 24 2007 ..
?rwsrwsrwt 1 laurent laurent 44 Oct 1 2006 00-index-key
...

Althought I was able to mount it with no special option on 2.6.28-rc6:

~$ sudo mount -oro -t udf /dev/sr0 /media/cdrom/
~$ grep /media/cdrom /proc/mounts
/dev/scd0 /media/cdrom udf ro,utf8 0 0
~$ ls -la /media/cdrom/
total 46
drwxrwxrwx 5 root root 344 2007-12-24 18:09 .
drwxr-xr-x 12 root root 4096 2008-12-01 00:22 ..
drwxr-x--- 2 laurent laurent 7112 2008-11-30 20:14 flexbackup
drwxr-xr-x 2 root root 40 2005-11-20 23:37 lost+found
drwxr-x--- 10 laurent laurent 4548 2005-11-25 18:18 patches ~$ ls -la /media/cdrom/flexbackup/
total 4307946
drwxr-x--- 2 laurent laurent 7112 2008-11-30 20:14 .
drwxrwxrwx 5 root root 344 2007-12-24 18:09 ..
-rw-r----- 1 laurent laurent 44 2006-10-01 15:36 00-index-key
...

~~
laurent

Quoted 21 lines · Laurent Riffard

Hi,

With next-2008-11-28, I was unable to mount an UDF-formatted DVD-RW:

~$ mount -oro -t udf /dev/sr0 /media/cdrom/
mount: Not a directory

There was no problem with 2.6.28-rc6.

I made a bisection:

33284bdf40f88160a154202510b27d983138c805 is first bad commit commit 33284bdf40f88160a154202510b27d983138c805

Author: Marcin Slusarz <[email protected]>
Date:   Sun Nov 16 20:52:19 2008 +0100

udf: implement mode and dmode mounting options

"dmode" allows overriding permissions of directories and "mode" allows overriding permissions of files.

Quoted 6 lines

Signed-off-by Marcin Slusarz <[email protected]>

Cc Jan Kara <[email protected]>

Signed-off-by Jan Kara <[email protected]>

Indeed, with this commit, I *must* use the dmode option to mount my DVD:

That's not intended behaviour... ;)

Quoted 3 lines

~$ sudo mount -oro,dmode=0755 -t udf /dev/sr0 /media/cdrom/ ~$ grep /media/cdrom /proc/mounts
/dev/scd0 /media/cdrom udf ro,mode=177777,dmode=755,utf8 0 0

                                     ^^^^^^

funny (it's 65535 / (u16)-1)

Can you check whether attached patch fixes it?
What architecture are you testing on?

fs/udf/inode.c +2 -2

index 6612a27..9eeb726 100644
@@ -1222,10 +1222,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
 	iinfo->i_lenExtents = inode->i_size;
 
 	if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY &&
-			sbi->s_fmode != -1)
+			sbi->s_fmode != (mode_t)-1)
 		inode->i_mode = sbi->s_fmode;
 	else if (fe->icbTag.fileType == ICBTAG_FILE_TYPE_DIRECTORY &&
-			sbi->s_dmode != -1)
+			sbi->s_dmode != (mode_t)-1)
 		inode->i_mode = sbi->s_dmode;
 	else
 		inode->i_mode = udf_convert_permissions(fe);

fs/udf/super.c +0 -0

index e5d121d..af8a771 100644
@@ -284,9 +284,9 @@ static int udf_show_options(struct seq_file *seq, struct vfsmount *mnt)
 		seq_printf(seq, ",gid=%u", sbi->s_gid);

Quoted 2 lines

Quoted 1 line

With next-2008-11-28, I was unable to mount an UDF-formatted DVD-RW:

Can you check whether attached patch fixes it?

Current kernel is next-20081128 + reiser4 patches + your patch: it seems to works well now. (...)

Tested-by Laurent Riffard <[email protected]>

Quoted 5 lines · Laurent Riffard

Quoted 2 lines

Quoted 1 line

With next-2008-11-28, I was unable to mount an UDF-formatted DVD-RW:

Can you check whether attached patch fixes it?

Current kernel is next-20081128 + reiser4 patches + your patch: it seems to works well now. (...)

Tested-by Laurent Riffard <[email protected]>

Thanks!

Jan, please apply this patch:

---
From: Marcin Slusarz <[email protected]>
Subject: [PATCH] udf: fix default mode and dmode options handling

On x86 (and several other archs) mode_t is defined as "unsigned short" and comparing unsigned shorts to negative ints is broken (because short is promoted to int and then compared). Fix it.

Reported-and-tested-by Laurent Riffard <[email protected]>

Signed-off-by Marcin Slusarz <[email protected]>

---
 fs/udf/inode.c  |    4 ++--
 fs/udf/super.c  |    8 ++++----
 fs/udf/udf_sb.h |    2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

fs/udf/inode.c +2 -2

index 6612a27..2d7e56a 100644
@@ -1222,10 +1222,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
 	iinfo->i_lenExtents = inode->i_size;
 
 	if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY &&
-			sbi->s_fmode != -1)
+			sbi->s_fmode != UDF_INVALID_MODE)
 		inode->i_mode = sbi->s_fmode;
 	else if (fe->icbTag.fileType == ICBTAG_FILE_TYPE_DIRECTORY &&
-			sbi->s_dmode != -1)
+			sbi->s_dmode != UDF_INVALID_MODE)
 		inode->i_mode = sbi->s_dmode;
 	else
 		inode->i_mode = udf_convert_permissions(fe);

fs/udf/super.c +4 -4

index e5d121d..8deaa61 100644
@@ -284,9 +284,9 @@ static int udf_show_options(struct seq_file *seq, struct vfsmount *mnt)
 		seq_printf(seq, ",gid=%u", sbi->s_gid);
 	if (sbi->s_umask != 0)
 		seq_printf(seq, ",umask=%o", sbi->s_umask);
-	if (sbi->s_fmode != -1)
+	if (sbi->s_fmode != UDF_INVALID_MODE)
 		seq_printf(seq, ",mode=%o", sbi->s_fmode);
-	if (sbi->s_dmode != -1)
+	if (sbi->s_dmode != UDF_INVALID_MODE)
 		seq_printf(seq, ",dmode=%o", sbi->s_dmode);
 	if (UDF_QUERY_FLAG(sb, UDF_FLAG_SESSION_SET))
 		seq_printf(seq, ",session=%u", sbi->s_session);

@@ -1894,8 +1894,8 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
 	uopt.uid = -1;
 	uopt.gid = -1;
 	uopt.umask = 0;
-	uopt.fmode = -1;
-	uopt.dmode = -1;
+	uopt.fmode = UDF_INVALID_MODE;
+	uopt.dmode = UDF_INVALID_MODE;
 
 	sbi = kzalloc(sizeof(struct udf_sb_info), GFP_KERNEL);
 	if (!sbi)

fs/udf/udf_sb.h +2 -0

index 5d32c60..158221e 100644
@@ -48,6 +48,8 @@
 #define UDF_SPARABLE_MAP15		0x1522U
 #define UDF_METADATA_MAP25		0x2511U
 
+#define UDF_INVALID_MODE		((mode_t)-1)
+
 #pragma pack(1) /* XXX(hch): Why?  This file just defines in-core structures */
 
 struct udf_meta_data {

Signature · 1 line

1.5.6.4