Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72c1c2f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 2d6244b3 4937a269

arch/microblaze/configs/mmu_defconfig

+3 −1
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y
@@ -81,6 +80,9 @@ CONFIG_DETECT_HUNG_TASK=y 
CONFIG_DEBUG_SLAB=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_INFO=y

CONFIG_KGDB=y

CONFIG_KGDB_TESTS=y

CONFIG_KGDB_KDB=y

CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y

arch/microblaze/include/asm/unistd.h

+3 −0
Original line number Diff line number Diff line
@@ -38,4 +38,7 @@ 
#define __ARCH_WANT_SYS_FORK



#endif /* __ASSEMBLY__ */



#define __NR_syscalls         381



#endif /* _ASM_MICROBLAZE_UNISTD_H */

arch/microblaze/include/uapi/asm/unistd.h

+0 −2
Original line number Diff line number Diff line
@@ -397,6 +397,4 @@ 
#define __NR_kcmp		379

#define __NR_finit_module	380



#define __NR_syscalls		381



#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */

arch/microblaze/kernel/kgdb.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void kgdb_arch_exit(void) 
/*

 * Global data

 */

const struct kgdb_arch arch_kgdb_ops = {

struct kgdb_arch arch_kgdb_ops = {

#ifdef __MICROBLAZEEL__

	.gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */

#else

drivers/block/xsysace.c

+2 −2
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static void ace_dump_regs(struct ace_device *ace) 
		 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)

	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 */

struct request *ace_get_next_request(struct request_queue * q)

static struct request *ace_get_next_request(struct request_queue *q)

{

	struct request *req;