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

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: pci_controller->arch_data really is a struct device_node *
microblaze: Add missing double apostrophe in Kconfig
microblaze: Add PT_ macros for special purpose regs
microblaze: Enable accept4 syscall
microblaze: Wire up recvmmsg syscall

Linus Torvalds 91302873 fe64454d

+20 -5
unified split
+1 -1
arch/microblaze/Kconfig
··· 90 91 menu "Processor type and features" 92 93 - source kernel/time/Kconfig 94 95 source "kernel/Kconfig.preempt" 96
··· 90 91 menu "Processor type and features" 92 93 + source "kernel/time/Kconfig" 94 95 source "kernel/Kconfig.preempt" 96
+14
arch/microblaze/include/asm/ptrace.h
··· 54 int pt_mode; 55 }; 56 57 #define kernel_mode(regs) ((regs)->pt_mode) 58 #define user_mode(regs) (!kernel_mode(regs)) 59 ··· 62 #define profile_pc(regs) instruction_pointer(regs) 63 64 void show_regs(struct pt_regs *); 65 66 #endif /* __ASSEMBLY__ */ 67
··· 54 int pt_mode; 55 }; 56 57 + #ifdef __KERNEL__ 58 #define kernel_mode(regs) ((regs)->pt_mode) 59 #define user_mode(regs) (!kernel_mode(regs)) 60 ··· 61 #define profile_pc(regs) instruction_pointer(regs) 62 63 void show_regs(struct pt_regs *); 64 + 65 + #else /* __KERNEL__ */ 66 + 67 + /* pt_regs offsets used by gdbserver etc in ptrace syscalls */ 68 + #define PT_GPR(n) ((n) * sizeof(microblaze_reg_t)) 69 + #define PT_PC (32 * sizeof(microblaze_reg_t)) 70 + #define PT_MSR (33 * sizeof(microblaze_reg_t)) 71 + #define PT_EAR (34 * sizeof(microblaze_reg_t)) 72 + #define PT_ESR (35 * sizeof(microblaze_reg_t)) 73 + #define PT_FSR (36 * sizeof(microblaze_reg_t)) 74 + #define PT_KERNEL_MODE (37 * sizeof(microblaze_reg_t)) 75 + 76 + #endif /* __KERNEL */ 77 78 #endif /* __ASSEMBLY__ */ 79
+3 -2
arch/microblaze/include/asm/unistd.h
··· 377 #define __NR_shutdown 359 /* new */ 378 #define __NR_sendmsg 360 /* new */ 379 #define __NR_recvmsg 361 /* new */ 380 - #define __NR_accept04 362 /* new */ 381 #define __NR_preadv 363 /* new */ 382 #define __NR_pwritev 364 /* new */ 383 #define __NR_rt_tgsigqueueinfo 365 /* new */ 384 #define __NR_perf_event_open 366 /* new */ 385 386 - #define __NR_syscalls 367 387 388 #ifdef __KERNEL__ 389 #ifndef __ASSEMBLY__
··· 377 #define __NR_shutdown 359 /* new */ 378 #define __NR_sendmsg 360 /* new */ 379 #define __NR_recvmsg 361 /* new */ 380 + #define __NR_accept4 362 /* new */ 381 #define __NR_preadv 363 /* new */ 382 #define __NR_pwritev 364 /* new */ 383 #define __NR_rt_tgsigqueueinfo 365 /* new */ 384 #define __NR_perf_event_open 366 /* new */ 385 + #define __NR_recvmmsg 367 /* new */ 386 387 + #define __NR_syscalls 368 388 389 #ifdef __KERNEL__ 390 #ifndef __ASSEMBLY__
+1 -1
arch/microblaze/kernel/prom_parse.c
··· 256 if (ppdev == NULL) { 257 struct pci_controller *host; 258 host = pci_bus_to_host(pdev->bus); 259 - ppnode = host ? host->arch_data : NULL; 260 /* No node for host bridge ? give up */ 261 if (ppnode == NULL) 262 return -EINVAL;
··· 256 if (ppdev == NULL) { 257 struct pci_controller *host; 258 host = pci_bus_to_host(pdev->bus); 259 + ppnode = host ? host->dn : NULL; 260 /* No node for host bridge ? give up */ 261 if (ppnode == NULL) 262 return -EINVAL;
+1 -1
arch/microblaze/kernel/syscall_table.S
··· 366 .long sys_shutdown 367 .long sys_sendmsg /* 360 */ 368 .long sys_recvmsg 369 - .long sys_ni_syscall 370 .long sys_ni_syscall 371 .long sys_ni_syscall 372 .long sys_rt_tgsigqueueinfo /* 365 */
··· 366 .long sys_shutdown 367 .long sys_sendmsg /* 360 */ 368 .long sys_recvmsg 369 + .long sys_accept4 370 .long sys_ni_syscall 371 .long sys_ni_syscall 372 .long sys_rt_tgsigqueueinfo /* 365 */