Commit 607117a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core fixes from Greg KH:
 "Here are a small number of debugfs, ISA, and one driver core fix for
  4.7-rc4.

  All of these resolve reported issues.  The ISA ones have spent the
  least amount of time in linux-next, sorry about that, I didn't realize
  they were regressions that needed to get in now (thanks to Thorsten
  for the prodding!) but they do all pass the 0-day bot tests.  The
  others have been in linux-next for a while now.

  Full details about them are in the shortlog below"

* tag 'driver-core-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  isa: Dummy isa_register_driver should return error code
  isa: Call isa_bus_init before dependent ISA bus drivers register
  watchdog: ebc-c384_wdt: Allow build for X86_64
  iio: stx104: Allow build for X86_64
  gpio: Allow PC/104 devices on X86_64
  isa: Allow ISA-style drivers on modern systems
  base: make module_create_drivers_dir race-free
  debugfs: open_proxy_open(): avoid double fops release
  debugfs: full_proxy_open(): free proxy on ->open() failure
  kernel/kcov: unproxify debugfs file's fops
parents 07b5ca22 5e25db87

arch/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -606,6 +606,9 @@ config HAVE_ARCH_HASH 
	  file which provides platform-specific implementations of some

	  file which provides platform-specific implementations of some

	  functions in <linux/hash.h> or fs/namei.c.

	  functions in <linux/hash.h> or fs/namei.c.





config ISA_BUS_API

	def_bool ISA



#

#

# ABI hall of shame

# ABI hall of shame

#

#

arch/x86/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -2439,6 +2439,15 @@ config PCI_CNB20LE_QUIRK 




source "drivers/pci/Kconfig"

source "drivers/pci/Kconfig"





config ISA_BUS

	bool "ISA-style bus support on modern systems" if EXPERT

	select ISA_BUS_API

	help

	  Enables ISA-style drivers on modern systems. This is necessary to

	  support PC/104 devices on X86_64 platforms.



	  If unsure, say N.



# x86_64 have no ISA slots, but can have ISA-style DMA.

# x86_64 have no ISA slots, but can have ISA-style DMA.

config ISA_DMA_API

config ISA_DMA_API

	bool "ISA-style DMA support" if (X86_64 && EXPERT)

	bool "ISA-style DMA support" if (X86_64 && EXPERT)

drivers/base/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o 
obj-y			+= power/

obj-y			+= power/

obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o

obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o

obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o

obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o

obj-$(CONFIG_ISA)	+= isa.o

obj-$(CONFIG_ISA_BUS_API)	+= isa.o

obj-$(CONFIG_FW_LOADER)	+= firmware_class.o

obj-$(CONFIG_FW_LOADER)	+= firmware_class.o

obj-$(CONFIG_NUMA)	+= node.o

obj-$(CONFIG_NUMA)	+= node.o

obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o

obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o

drivers/base/isa.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -180,4 +180,4 @@ static int __init isa_bus_init(void) 
	return error;

	return error;

}

}





device_initcall(isa_bus_init);
 
postcore_initcall(isa_bus_init);

drivers/base/module.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -24,10 +24,12 @@ static char *make_driver_name(struct device_driver *drv) 




static void module_create_drivers_dir(struct module_kobject *mk)

static void module_create_drivers_dir(struct module_kobject *mk)

{

{

	if (!mk || mk->drivers_dir)

	static DEFINE_MUTEX(drivers_dir_mutex);

		return;





	mutex_lock(&drivers_dir_mutex);

	if (mk && !mk->drivers_dir)

		mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);

		mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);

	mutex_unlock(&drivers_dir_mutex);

}

}





void module_add_driver(struct module *mod, struct device_driver *drv)

void module_add_driver(struct module *mod, struct device_driver *drv)

CRA Git | Maintained and supported by SUSTech CRA and CCSE