diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 11:19:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 11:19:28 -0800 |
| commit | 1306b0471ff11409e4f18f3cde00215d367e007a (patch) | |
| tree | ee041c404f964929b62fc734fa65b7afea58643f /arch/x86 | |
| parent | 76d9c6c1c6eb115c2c686d5cbf10a68857511853 (diff) | |
| parent | ad32a1f3c36b046b2e7b0361b88c18e3af61419e (diff) | |
| download | op-kernel-dev-1306b0471ff11409e4f18f3cde00215d367e007a.zip op-kernel-dev-1306b0471ff11409e4f18f3cde00215d367e007a.tar.gz | |
Merge branch 'for-linus-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"This contains three bug/build fixes"
* 'for-linus-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: use %lx format specifiers for unsigned longs
um: Export pm_power_off
Revert "um: Fix get_signal() usage"
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/um/os-Linux/task_size.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/um/os-Linux/task_size.c b/arch/x86/um/os-Linux/task_size.c index 8502ad3..5adb6a2 100644 --- a/arch/x86/um/os-Linux/task_size.c +++ b/arch/x86/um/os-Linux/task_size.c @@ -109,7 +109,7 @@ unsigned long os_get_top_address(void) exit(1); } - printf("0x%x\n", bottom << UM_KERN_PAGE_SHIFT); + printf("0x%lx\n", bottom << UM_KERN_PAGE_SHIFT); printf("Locating the top of the address space ... "); fflush(stdout); @@ -134,7 +134,7 @@ out: exit(1); } top <<= UM_KERN_PAGE_SHIFT; - printf("0x%x\n", top); + printf("0x%lx\n", top); return top; } |
