diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-15 11:55:21 +0100 |
---|---|---|
committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-15 11:55:21 +0100 |
commit | 75a5f1b3f88460875de0359adf2cb865584bd2a0 (patch) | |
tree | eb663fec937cde95a787a3c9648725f8f6cc81f8 | |
parent | 0a8fb9671438041a436779af81c5f69e8cb2f32a (diff) | |
download | patches-75a5f1b3f88460875de0359adf2cb865584bd2a0.tar.gz |
add include for xen, fix failure inject in memory
-rw-r--r-- | 03-memory.patch | 6 | ||||
-rw-r--r-- | 08-xen.patch | 27 |
2 files changed, 17 insertions, 16 deletions
diff --git a/03-memory.patch b/03-memory.patch index 3013096..fe940bb 100644 --- a/03-memory.patch +++ b/03-memory.patch @@ -288,13 +288,13 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> - err = sysfs_create_file(&memory_sysdev_class.kset.kobj, - &class_attr_soft_offline_page.attr); -+ err = device_create_file(memory_susbsy.dev_root, -+ &dev_attr_soft_offline_page.attr); ++ err = device_create_file(memory_subsys.dev_root, ++ &dev_attr_soft_offline_page); if (!err) - err = sysfs_create_file(&memory_sysdev_class.kset.kobj, - &class_attr_hard_offline_page.attr); + err = device_create_file(memory_subsys.dev_root, -+ &dev_attr_hard_offline_page.attr); ++ &dev_attr_hard_offline_page); return err; } #else diff --git a/08-xen.patch b/08-xen.patch index 7ea3fd1..56def8d 100644 --- a/08-xen.patch +++ b/08-xen.patch @@ -7,9 +7,9 @@ sysdev implementation will be entirely removed from the kernel. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> --- drivers/xen/xen-balloon.c | 86 +++++++++++++++++++++--------------------- - drivers/xen/xen-selfballoon.c | 75 ++++++++++++++++++------------------ + drivers/xen/xen-selfballoon.c | 76 ++++++++++++++++++------------------- include/xen/balloon.h | 6 +- - 3 files changed, 83 insertions(+), 84 deletions(-) + 3 files changed, 84 insertions(+), 84 deletions(-) --- a/drivers/xen/xen-balloon.c +++ b/drivers/xen/xen-balloon.c @@ -208,11 +208,12 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c -@@ -266,21 +266,20 @@ static void selfballoon_process(struct w +@@ -266,21 +266,21 @@ static void selfballoon_process(struct w #ifdef CONFIG_SYSFS -#include <linux/sysdev.h> ++#include <linux/device.h> #include <linux/capability.h> #define SELFBALLOON_SHOW(name, format, args...) \ @@ -235,7 +236,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -303,13 +302,13 @@ static ssize_t store_selfballooning(stru +@@ -303,13 +303,13 @@ static ssize_t store_selfballooning(stru return count; } @@ -252,7 +253,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -325,13 +324,13 @@ static ssize_t store_selfballoon_interva +@@ -325,13 +325,13 @@ static ssize_t store_selfballoon_interva return count; } @@ -269,7 +270,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -347,14 +346,14 @@ static ssize_t store_selfballoon_downhys +@@ -347,14 +347,14 @@ static ssize_t store_selfballoon_downhys return count; } @@ -287,7 +288,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -370,14 +369,14 @@ static ssize_t store_selfballoon_uphys(s +@@ -370,14 +370,14 @@ static ssize_t store_selfballoon_uphys(s return count; } @@ -305,7 +306,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -393,7 +392,7 @@ static ssize_t store_selfballoon_min_usa +@@ -393,7 +393,7 @@ static ssize_t store_selfballoon_min_usa return count; } @@ -314,7 +315,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> show_selfballoon_min_usable_mb, store_selfballoon_min_usable_mb); -@@ -401,8 +400,8 @@ static SYSDEV_ATTR(selfballoon_min_usabl +@@ -401,8 +401,8 @@ static SYSDEV_ATTR(selfballoon_min_usabl #ifdef CONFIG_FRONTSWAP SELFBALLOON_SHOW(frontswap_selfshrinking, "%d\n", frontswap_selfshrinking); @@ -325,7 +326,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -424,13 +423,13 @@ static ssize_t store_frontswap_selfshrin +@@ -424,13 +424,13 @@ static ssize_t store_frontswap_selfshrin return count; } @@ -342,7 +343,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -447,13 +446,13 @@ static ssize_t store_frontswap_inertia(s +@@ -447,13 +447,13 @@ static ssize_t store_frontswap_inertia(s return count; } @@ -359,7 +360,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> const char *buf, size_t count) { -@@ -469,21 +468,21 @@ static ssize_t store_frontswap_hysteresi +@@ -469,21 +469,21 @@ static ssize_t store_frontswap_hysteresi return count; } @@ -390,7 +391,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> #endif NULL }; -@@ -494,12 +493,12 @@ static struct attribute_group selfballoo +@@ -494,12 +494,12 @@ static struct attribute_group selfballoo }; #endif |