On Sat, Apr 18, 2015 at 1:06 AM, Greg KH <gre...@linuxfoundation.org> wrote: > On Fri, Apr 17, 2015 at 09:35:52PM -0400, Dan Williams wrote: >> Register the dimms described in the nfit as devices on a nd_bus, named >> "dimmN" where N is a global ida index. The dimm numbering per-bus may >> appear contiguous, since we only allow a single nd_bus to be registered >> at at a time. However, eventually, dimm-hotplug invalidates this >> property and dimms should be addressed via NFIT-handle. >> >> Cc: Greg KH <gre...@linuxfoundation.org> >> Cc: Neil Brown <ne...@suse.de> >> Signed-off-by: Dan Williams <dan.j.willi...@intel.com> >> --- >> drivers/block/nd/Makefile | 1 >> drivers/block/nd/bus.c | 62 +++++++++- >> drivers/block/nd/core.c | 55 +++++++++ >> drivers/block/nd/dimm_devs.c | 243 >> +++++++++++++++++++++++++++++++++++++++++ >> drivers/block/nd/nd-private.h | 19 +++ >> 5 files changed, 373 insertions(+), 7 deletions(-) >> create mode 100644 drivers/block/nd/dimm_devs.c >> >> diff --git a/drivers/block/nd/Makefile b/drivers/block/nd/Makefile >> index 7772fb599809..6b34dd4d4df8 100644 >> --- a/drivers/block/nd/Makefile >> +++ b/drivers/block/nd/Makefile >> @@ -21,3 +21,4 @@ nd_acpi-y := acpi.o >> >> nd-y := core.o >> nd-y += bus.o >> +nd-y += dimm_devs.o >> diff --git a/drivers/block/nd/bus.c b/drivers/block/nd/bus.c >> index c27db50511f2..e24db67001d0 100644 >> --- a/drivers/block/nd/bus.c >> +++ b/drivers/block/nd/bus.c >> @@ -13,18 +13,59 @@ >> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >> #include <linux/uaccess.h> >> #include <linux/fcntl.h> >> +#include <linux/async.h> >> #include <linux/slab.h> >> #include <linux/fs.h> >> #include <linux/io.h> >> #include "nd-private.h" >> #include "nfit.h" >> >> -static int nd_major; >> +static int nd_bus_major; > > Call it nd_bus_major in the previous patch, and avoid the unneeded churn > in this patch.
Ok, will do when re-flowing this series for merging. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
