diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /drivers/xen/balloon.c | |
| parent | 93c8b90f01f0dc73891da4e84b26524b61d29d66 (diff) | |
| parent | 0523820482dcb42784572ffd2296c2f08c275a2b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'drivers/xen/balloon.c')
| -rw-r--r-- | drivers/xen/balloon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index d4427cb86979..2e15da5459cf 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
| @@ -60,7 +60,7 @@ | |||
| 60 | 60 | ||
| 61 | #define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10)) | 61 | #define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10)) |
| 62 | 62 | ||
| 63 | #define BALLOON_CLASS_NAME "memory" | 63 | #define BALLOON_CLASS_NAME "xen_memory" |
| 64 | 64 | ||
| 65 | struct balloon_stats { | 65 | struct balloon_stats { |
| 66 | /* We aim for 'current allocation' == 'target allocation'. */ | 66 | /* We aim for 'current allocation' == 'target allocation'. */ |