diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 12:23:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 12:23:41 -0700 |
| commit | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (patch) | |
| tree | ce7e4e6056b575138777793520dded9cb3638056 /drivers | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | x86: fix memmap=exactmap boot argument (diff) | |
| download | linux-dev-93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95.tar.xz linux-dev-93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix memmap=exactmap boot argument
x86: disable static NOPLs on 32 bits
xen: fix 2.6.27-rc5 xen balloon driver warnings
Diffstat (limited to 'drivers')
| -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 @@ #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'. */ |