mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 11:00:56 +07:00
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.
This commit is contained in:
commit
72c1c2f1be
@ -1,4 +1,3 @@
|
||||
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
|
||||
|
@ -38,4 +38,7 @@
|
||||
#define __ARCH_WANT_SYS_FORK
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#define __NR_syscalls 381
|
||||
|
||||
#endif /* _ASM_MICROBLAZE_UNISTD_H */
|
||||
|
@ -397,6 +397,4 @@
|
||||
#define __NR_kcmp 379
|
||||
#define __NR_finit_module 380
|
||||
|
||||
#define __NR_syscalls 381
|
||||
|
||||
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user