Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 158e0d36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.15-rc1' of... 

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

Pull driver core and sysfs updates from Greg KH:
 "Here's the big driver core / sysfs update for 3.15-rc1.

  Lots of kernfs updates to make it useful for other subsystems, and a
  few other tiny driver core patches.

  All have been in linux-next for a while"

* tag 'driver-core-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (42 commits)
  Revert "sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()"
  kernfs: cache atomic_write_len in kernfs_open_file
  numa: fix NULL pointer access and memory leak in unregister_one_node()
  Revert "driver core: synchronize device shutdown"
  kernfs: fix off by one error.
  kernfs: remove duplicate dir.c at the top dir
  x86: align x86 arch with generic CPU modalias handling
  cpu: add generic support for CPU feature based module autoloading
  sysfs: create bin_attributes under the requested group
  driver core: unexport static function create_syslog_header
  firmware: use power efficient workqueue for unloading and aborting fw load
  firmware: give a protection when map page failed
  firmware: google memconsole driver fixes
  firmware: fix google/gsmi duplicate efivars_sysfs_init()
  drivers/base: delete non-required instances of include <linux/init.h>
  kernfs: fix kernfs_node_from_dentry()
  ACPI / platform: drop redundant ACPI_HANDLE check
  kernfs: fix hash calculation in kernfs_rename_ns()
  kernfs: add CONFIG_KERNFS
  sysfs, kobject: add sysfs wrapper for kernfs_enable_ns()
  ...
parents 675c354a 72099304

arch/s390/include/asm/ccwgroup.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct ccwgroup_device { 
	unsigned int count;

	struct device	dev;

	struct ccw_device *cdev[0];

	struct work_struct ungroup_work;

};



/**

arch/s390/pci/pci_sysfs.c

+8 −10
Original line number Diff line number Diff line
@@ -48,29 +48,27 @@ static ssize_t show_pfgid(struct device *dev, struct device_attribute *attr, 
}

static DEVICE_ATTR(pfgid, S_IRUGO, show_pfgid, NULL);



static void recover_callback(struct device *dev)

static ssize_t store_recover(struct device *dev, struct device_attribute *attr,

			     const char *buf, size_t count)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct zpci_dev *zdev = get_zdev(pdev);

	int ret;



	if (!device_remove_file_self(dev, attr))

		return count;



	pci_stop_and_remove_bus_device(pdev);

	ret = zpci_disable_device(zdev);

	if (ret)

		return;

		return ret;



	ret = zpci_enable_device(zdev);

	if (ret)

		return;

		return ret;



	pci_rescan_bus(zdev->bus);

}



static ssize_t store_recover(struct device *dev, struct device_attribute *attr,

			     const char *buf, size_t count)

{

	int rc = device_schedule_callback(dev, recover_callback);

	return rc ? rc : count;

	return count;

}

static DEVICE_ATTR(recover, S_IWUSR, NULL, store_recover);

arch/x86/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ config X86 
	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64

	select HAVE_CC_STACKPROTECTOR

	select GENERIC_CPU_AUTOPROBE



config INSTRUCTION_DECODER

	def_bool y
@@ -195,9 +196,6 @@ config ARCH_HAS_CPU_RELAX 
config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



config ARCH_HAS_CPU_AUTOPROBE

	def_bool y



config HAVE_SETUP_PER_CPU_AREA

	def_bool y

arch/x86/include/asm/cpufeature.h

+7 −0
Original line number Diff line number Diff line
@@ -546,6 +546,13 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) 
#define static_cpu_has_bug(bit)	static_cpu_has((bit))

#define boot_cpu_has_bug(bit)	cpu_has_bug(&boot_cpu_data, (bit))



#define MAX_CPU_FEATURES	(NCAPINTS * 32)

#define cpu_have_feature	boot_cpu_has



#define CPU_FEATURE_TYPEFMT	"x86,ven%04Xfam%04Xmod%04X"

#define CPU_FEATURE_TYPEVAL	boot_cpu_data.x86_vendor, boot_cpu_data.x86, \

				boot_cpu_data.x86_model



#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */



#endif /* _ASM_X86_CPUFEATURE_H */

arch/x86/kernel/cpu/match.c

+0 −42
Original line number Diff line number Diff line
@@ -47,45 +47,3 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match) 
	return NULL;

}

EXPORT_SYMBOL(x86_match_cpu);
 


ssize_t arch_print_cpu_modalias(struct device *dev,

				struct device_attribute *attr,

				char *bufptr)

{

	int size = PAGE_SIZE;

	int i, n;

	char *buf = bufptr;



	n = snprintf(buf, size, "x86cpu:vendor:%04X:family:%04X:"

		     "model:%04X:feature:",

		boot_cpu_data.x86_vendor,

		boot_cpu_data.x86,

		boot_cpu_data.x86_model);

	size -= n;

	buf += n;

	size -= 1;

	for (i = 0; i < NCAPINTS*32; i++) {

		if (boot_cpu_has(i)) {

			n = snprintf(buf, size, ",%04X", i);

			if (n >= size) {

				WARN(1, "x86 features overflow page\n");

				break;

			}

			size -= n;

			buf += n;

		}

	}

	*buf++ = '\n';

	return buf - bufptr;

}



int arch_cpu_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	char *buf = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (buf) {

		arch_print_cpu_modalias(NULL, NULL, buf);

		add_uevent_var(env, "MODALIAS=%s", buf);

		kfree(buf);

	}

	return 0;

}