lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Linus Torvalds
2013-07-10 10:16:07 -07:00
parent 2d6244b3cc 4937a269cb
commit 72c1c2f1be
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/microblaze/configs/mmu_defconfig
View File

@@ -1,4 +1,3 @@
CONFIG_EXPERIMENTAL=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE=y
CONFIG_FHANDLE=y CONFIG_FHANDLE=y
@@ -81,6 +80,9 @@ CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_SLAB=y
CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO=y
CONFIG_KGDB=y
CONFIG_KGDB_TESTS=y
CONFIG_KGDB_KDB=y
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KEYS=y CONFIG_KEYS=y
CONFIG_ENCRYPTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y

3
arch/microblaze/include/asm/unistd.h
View File

@@ -38,4 +38,7 @@
#define __ARCH_WANT_SYS_FORK #define __ARCH_WANT_SYS_FORK
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define __NR_syscalls 381
#endif /* _ASM_MICROBLAZE_UNISTD_H */ #endif /* _ASM_MICROBLAZE_UNISTD_H */

2
arch/microblaze/include/uapi/asm/unistd.h
View File

@@ -397,6 +397,4 @@
#define __NR_kcmp 379 #define __NR_kcmp 379
#define __NR_finit_module 380 #define __NR_finit_module 380
#define __NR_syscalls 381
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */

2
arch/microblaze/kernel/kgdb.c
View File

@@ -141,7 +141,7 @@ void kgdb_arch_exit(void)
/* /*
* Global data * Global data
*/ */
const struct kgdb_arch arch_kgdb_ops = { struct kgdb_arch arch_kgdb_ops = {
#ifdef __MICROBLAZEEL__ #ifdef __MICROBLAZEEL__
.gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
#else #else

4
drivers/block/xsysace.c
View File

@@ -407,7 +407,7 @@ static void ace_dump_regs(struct ace_device *ace)
ace_in32(ace, ACE_CFGLBA), ace_in(ace, ACE_FATSTAT)); ace_in32(ace, ACE_CFGLBA), ace_in(ace, ACE_FATSTAT));
} }
void ace_fix_driveid(u16 *id) static void ace_fix_driveid(u16 *id)
{ {
#if defined(__BIG_ENDIAN) #if defined(__BIG_ENDIAN)
int i; int i;
@@ -463,7 +463,7 @@ static inline void ace_fsm_yieldirq(struct ace_device *ace)
} }
/* Get the next read/write request; ending requests that we don't handle */ /* Get the next read/write request; ending requests that we don't handle */
struct request *ace_get_next_request(struct request_queue * q) static struct request *ace_get_next_request(struct request_queue *q)
{ {
struct request *req; struct request *req;