projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4.4/topic/mm-kaslr-pax_usercopy' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pci
/
hotplug
/
rpadlpar_sysfs.c
diff --git
a/drivers/pci/hotplug/rpadlpar_sysfs.c
b/drivers/pci/hotplug/rpadlpar_sysfs.c
index 779c5db71be46150bc5c34896bea57dc23697b9e..a796301ea03fbd3709f15be52f78053bb12380f9 100644
(file)
--- a/
drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/
drivers/pci/hotplug/rpadlpar_sysfs.c
@@
-14,8
+14,10
@@
*/
#include <linux/kobject.h>
#include <linux/string.h>
*/
#include <linux/kobject.h>
#include <linux/string.h>
+#include <linux/pci.h>
#include <linux/pci_hotplug.h>
#include "rpadlpar.h"
#include <linux/pci_hotplug.h>
#include "rpadlpar.h"
+#include "../pci.h"
#define DLPAR_KOBJ_NAME "control"
#define DLPAR_KOBJ_NAME "control"
@@
-27,7
+29,6
@@
#define MAX_DRC_NAME_LEN 64
#define MAX_DRC_NAME_LEN 64
-
static ssize_t add_slot_store(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t nbytes)
{
static ssize_t add_slot_store(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t nbytes)
{
@@
-112,7
+113,7
@@
int dlpar_sysfs_init(void)
int error;
dlpar_kobj = kobject_create_and_add(DLPAR_KOBJ_NAME,
int error;
dlpar_kobj = kobject_create_and_add(DLPAR_KOBJ_NAME,
- &pci_
hotplug_
slots_kset->kobj);
+ &pci_slots_kset->kobj);
if (!dlpar_kobj)
return -EINVAL;
if (!dlpar_kobj)
return -EINVAL;