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 'next' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze update from Michal Simek:
"This Microblaze merge window is quite minimal.

I have also added to my branch one xilinx systemace sparse fix because
haven't got any reply from block maintainer."

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
xilinx systemace: Fix sparse warnings
microblaze: Move __NR_syscalls from uapi
microblaze: Enable KGDB in defconfig
microblaze: Don't mark arch_kgdb_ops as const.

+9 -6
+3 -1
arch/microblaze/configs/mmu_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_SYSVIPC=y 3 2 CONFIG_POSIX_MQUEUE=y 4 3 CONFIG_FHANDLE=y ··· 80 81 CONFIG_DEBUG_SLAB=y 81 82 CONFIG_DEBUG_SPINLOCK=y 82 83 CONFIG_DEBUG_INFO=y 84 + CONFIG_KGDB=y 85 + CONFIG_KGDB_TESTS=y 86 + CONFIG_KGDB_KDB=y 83 87 CONFIG_EARLY_PRINTK=y 84 88 CONFIG_KEYS=y 85 89 CONFIG_ENCRYPTED_KEYS=y
+3
arch/microblaze/include/asm/unistd.h
··· 38 38 #define __ARCH_WANT_SYS_FORK 39 39 40 40 #endif /* __ASSEMBLY__ */ 41 + 42 + #define __NR_syscalls 381 43 + 41 44 #endif /* _ASM_MICROBLAZE_UNISTD_H */
-2
arch/microblaze/include/uapi/asm/unistd.h
··· 397 397 #define __NR_kcmp 379 398 398 #define __NR_finit_module 380 399 399 400 - #define __NR_syscalls 381 401 - 402 400 #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
+1 -1
arch/microblaze/kernel/kgdb.c
··· 141 141 /* 142 142 * Global data 143 143 */ 144 - const struct kgdb_arch arch_kgdb_ops = { 144 + struct kgdb_arch arch_kgdb_ops = { 145 145 #ifdef __MICROBLAZEEL__ 146 146 .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ 147 147 #else
+2 -2
drivers/block/xsysace.c
··· 407 407 ace_in32(ace, ACE_CFGLBA), ace_in(ace, ACE_FATSTAT)); 408 408 } 409 409 410 - void ace_fix_driveid(u16 *id) 410 + static void ace_fix_driveid(u16 *id) 411 411 { 412 412 #if defined(__BIG_ENDIAN) 413 413 int i; ··· 463 463 } 464 464 465 465 /* Get the next read/write request; ending requests that we don't handle */ 466 - struct request *ace_get_next_request(struct request_queue * q) 466 + static struct request *ace_get_next_request(struct request_queue *q) 467 467 { 468 468 struct request *req; 469 469