projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[cascardo/linux.git]
/
drivers
/
xen
/
balloon.c
diff --git
a/drivers/xen/balloon.c
b/drivers/xen/balloon.c
index
591bc29
..
2e15da5
100644
(file)
--- a/
drivers/xen/balloon.c
+++ b/
drivers/xen/balloon.c
@@
-60,7
+60,7
@@
#define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10))
#define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10))
-#define BALLOON_CLASS_NAME "memory"
+#define BALLOON_CLASS_NAME "
xen_
memory"
struct balloon_stats {
/* We aim for 'current allocation' == 'target allocation'. */
struct balloon_stats {
/* We aim for 'current allocation' == 'target allocation'. */
@@
-610,6
+610,7
@@
static ssize_t show_target_kb(struct sys_device *dev, char *buf)
}
static ssize_t store_target_kb(struct sys_device *dev,
}
static ssize_t store_target_kb(struct sys_device *dev,
+ struct sysdev_attribute *attr,
const char *buf,
size_t count)
{
const char *buf,
size_t count)
{