tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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"

Linus Torvalds 1306b047 76d9c6c1

+4 -3
+1
arch/um/kernel/reboot.c
··· 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 {
+1 -1
arch/um/kernel/signal.c
··· 69 69 struct ksignal ksig; 70 70 int handled_sig = 0; 71 71 72 - if (get_signal(&ksig)) { 72 + while (get_signal(&ksig)) { 73 73 handled_sig = 1; 74 74 /* Whee! Actually deliver the signal. */ 75 75 handle_signal(&ksig, regs);
+2 -2
arch/x86/um/os-Linux/task_size.c
··· 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 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 }