Commit 754a264c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 



* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (158 commits)
  commit 4f705ae3
  Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
  Date:   Mon Apr 3 17:09:22 2006 -0700
  
      [PATCH] DMI: move dmi_scan.c from arch/i386 to drivers/firmware/
      
      dmi_scan.c is arch-independent and is used by i386, x86_64, and ia64.
      Currently all three arches compile it from arch/i386, which means that ia64
      and x86_64 depend on things in arch/i386 that they wouldn't otherwise care
      about.
      
      This is simply "mv arch/i386/kernel/dmi_scan.c drivers/firmware/" (removing
      trailing whitespace) and the associated Makefile changes.  All three
      architectures already set CONFIG_DMI in their top-level Kconfig files.
      
      Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
      Cc: Andi Kleen <ak@muc.de>
      Cc: "Luck, Tony" <tony.luck@intel.com>
      Cc: Andrey Panin <pazke@orbita1.ru>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
  ...
parents f9814802 4f705ae3

arch/i386/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ extra-y := head.o init_task.o vmlinux.lds 


obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \

		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \

		pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \

		pci-dma.o i386_ksyms.o i387.o bootflag.o \

		quirks.o i8237.o topology.o alternative.o



obj-y				+= cpu/

arch/ia64/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.lds 
obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o	\

	 irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o		\

	 salinfo.o semaphore.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \

	 unwind.o mca.o mca_asm.o topology.o dmi_scan.o

	 unwind.o mca.o mca_asm.o topology.o



obj-$(CONFIG_IA64_BRL_EMU)	+= brl_emu.o

obj-$(CONFIG_IA64_GENERIC)	+= acpi-ext.o
@@ -30,7 +30,6 @@ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o 
obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o

obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o

mca_recovery-y			+= mca_drv.o mca_drv_asm.o

dmi_scan-y			+= ../../i386/kernel/dmi_scan.o



# The gate DSO image is built using a special linker script.

targets += gate.so gate-syms.o

arch/x86_64/kernel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ obj-y := process.o signal.o entry.o traps.o irq.o \ 
		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \

		x8664_ksyms.o i387.o syscall.o vsyscall.o \

		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \

		dmi_scan.o pci-dma.o pci-nommu.o

		pci-dma.o pci-nommu.o



obj-$(CONFIG_X86_MCE)         += mce.o

obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel.o
@@ -49,5 +49,3 @@ intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o 
quirks-y			+= ../../i386/kernel/quirks.o

i8237-y				+= ../../i386/kernel/i8237.o

msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
 
dmi_scan-y			+= ../../i386/kernel/dmi_scan.o

drivers/base/bus.c

+5 −0
Original line number Diff line number Diff line
@@ -188,6 +188,11 @@ static ssize_t driver_bind(struct device_driver *drv, 
		up(&dev->sem);

		if (dev->parent)

			up(&dev->parent->sem);



		if (err > 0) 		/* success */

			err = count;

		else if (err == 0)	/* driver didn't accept device */

			err = -ENODEV;

	}

	put_device(dev);

	put_bus(bus);

drivers/base/class.c

+6 −7
Original line number Diff line number Diff line
@@ -562,14 +562,13 @@ int class_device_add(struct class_device *class_dev) 
	kobject_uevent(&class_dev->kobj, KOBJ_ADD);



	/* notify any interfaces this device is now here */

	if (parent_class) {

	down(&parent_class->sem);

	list_add_tail(&class_dev->node, &parent_class->children);

		list_for_each_entry(class_intf, &parent_class->interfaces, node)

	list_for_each_entry(class_intf, &parent_class->interfaces, node) {

		if (class_intf->add)

			class_intf->add(class_dev, class_intf);

		up(&parent_class->sem);

	}

	up(&parent_class->sem);



 register_done:

	if (error) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE