Commit 1306b047 authored by Linus Torvalds's avatar Linus Torvalds

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"
parents 76d9c6c1 ad32a1f3
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <skas.h> #include <skas.h>
void (*pm_power_off)(void); void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
static void kill_off_processes(void) static void kill_off_processes(void)
{ {
......
...@@ -69,7 +69,7 @@ void do_signal(struct pt_regs *regs) ...@@ -69,7 +69,7 @@ void do_signal(struct pt_regs *regs)
struct ksignal ksig; struct ksignal ksig;
int handled_sig = 0; int handled_sig = 0;
if (get_signal(&ksig)) { while (get_signal(&ksig)) {
handled_sig = 1; handled_sig = 1;
/* Whee! Actually deliver the signal. */ /* Whee! Actually deliver the signal. */
handle_signal(&ksig, regs); handle_signal(&ksig, regs);
......
...@@ -109,7 +109,7 @@ unsigned long os_get_top_address(void) ...@@ -109,7 +109,7 @@ unsigned long os_get_top_address(void)
exit(1); 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 ... "); printf("Locating the top of the address space ... ");
fflush(stdout); fflush(stdout);
...@@ -134,7 +134,7 @@ unsigned long os_get_top_address(void) ...@@ -134,7 +134,7 @@ unsigned long os_get_top_address(void)
exit(1); exit(1);
} }
top <<= UM_KERN_PAGE_SHIFT; top <<= UM_KERN_PAGE_SHIFT;
printf("0x%x\n", top); printf("0x%lx\n", top);
return top; return top;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment