Merge branch 'for-linus-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

torvalds · torvalds · commit 1306b0471ff1 · 2016-03-06T11:19:28.000-08:00
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"
diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
@@ -12,6 +12,7 @@
 #include <skas.h>
 
 void (*pm_power_off)(void);
+EXPORT_SYMBOL(pm_power_off);
 
 static void kill_off_processes(void)
 {
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
@@ -69,7 +69,7 @@ void do_signal(struct pt_regs *regs)
 	struct ksignal ksig;
 	int handled_sig = 0;
 
-	if (get_signal(&ksig)) {
+	while (get_signal(&ksig)) {
 		handled_sig = 1;
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal(&ksig, regs);
diff --git 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 @@ unsigned long os_get_top_address(void)
 		exit(1);
 	}
 	top <<= UM_KERN_PAGE_SHIFT;
-	printf("0x%x\n", top);
+	printf("0x%lx\n", top);
 
 	return top;
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include <skas.h>`
`13`	`13`
`14`	`14`	`void (*pm_power_off)(void);`
	`15`	`+EXPORT_SYMBOL(pm_power_off);`
`15`	`16`
`16`	`17`	`static void kill_off_processes(void)`
`17`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ unsigned long os_get_top_address(void)`
`109`	`109`	`exit(1);`
`110`	`110`	`}`
`111`	`111`
`112`		`- printf("0x%x\n", bottom << UM_KERN_PAGE_SHIFT);`
	`112`	`+ printf("0x%lx\n", bottom << UM_KERN_PAGE_SHIFT);`
`113`	`113`	`printf("Locating the top of the address space ... ");`
`114`	`114`	`fflush(stdout);`
`115`	`115`
`@@ -134,7 +134,7 @@ unsigned long os_get_top_address(void)`
`134`	`134`	`exit(1);`
`135`	`135`	`}`
`136`	`136`	`top <<= UM_KERN_PAGE_SHIFT;`
`137`		`- printf("0x%x\n", top);`
	`137`	`+ printf("0x%lx\n", top);`
`138`	`138`
`139`	`139`	`return top;`
`140`	`140`	`}`