Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt: "wow, it has gone 10 releases since my last request :(" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32: avr32: fix building warnings caused by redefinitions of HZ avr32: fix relocation check for signed 18-bit offset avr32: move NODES_SHIFT into Kconfig and delete numnodes.h
This commit is contained in:
commit
101b82f56d
|
@ -205,6 +205,11 @@ config ARCH_DISCONTIGMEM_ENABLE
|
||||||
config ARCH_SPARSEMEM_ENABLE
|
config ARCH_SPARSEMEM_ENABLE
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
||||||
|
config NODES_SHIFT
|
||||||
|
int
|
||||||
|
default "2"
|
||||||
|
depends on NEED_MULTIPLE_NODES
|
||||||
|
|
||||||
source "mm/Kconfig"
|
source "mm/Kconfig"
|
||||||
|
|
||||||
config OWNERSHIP_TRACE
|
config OWNERSHIP_TRACE
|
||||||
|
|
|
@ -2,3 +2,4 @@
|
||||||
generic-y += clkdev.h
|
generic-y += clkdev.h
|
||||||
generic-y += exec.h
|
generic-y += exec.h
|
||||||
generic-y += trace_clock.h
|
generic-y += trace_clock.h
|
||||||
|
generic-y += param.h
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_NUMNODES_H
|
|
||||||
#define __ASM_AVR32_NUMNODES_H
|
|
||||||
|
|
||||||
/* Max 4 nodes */
|
|
||||||
#define NODES_SHIFT 2
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_NUMNODES_H */
|
|
|
@ -1,9 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_PARAM_H
|
|
||||||
#define __ASM_AVR32_PARAM_H
|
|
||||||
|
|
||||||
#include <uapi/asm/param.h>
|
|
||||||
|
|
||||||
# define HZ CONFIG_HZ
|
|
||||||
# define USER_HZ 100 /* User interfaces are in "ticks" */
|
|
||||||
# define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */
|
|
||||||
#endif /* __ASM_AVR32_PARAM_H */
|
|
|
@ -33,3 +33,4 @@ header-y += termbits.h
|
||||||
header-y += termios.h
|
header-y += termios.h
|
||||||
header-y += types.h
|
header-y += types.h
|
||||||
header-y += unistd.h
|
header-y += unistd.h
|
||||||
|
generic-y += param.h
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
#ifndef _UAPI__ASM_AVR32_PARAM_H
|
|
||||||
#define _UAPI__ASM_AVR32_PARAM_H
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef HZ
|
|
||||||
# define HZ 100
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* TODO: Should be configurable */
|
|
||||||
#define EXEC_PAGESIZE 4096
|
|
||||||
|
|
||||||
#ifndef NOGROUP
|
|
||||||
# define NOGROUP (-1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAXHOSTNAMELEN 64
|
|
||||||
|
|
||||||
#endif /* _UAPI__ASM_AVR32_PARAM_H */
|
|
|
@ -264,7 +264,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
|
||||||
break;
|
break;
|
||||||
case R_AVR32_GOT18SW:
|
case R_AVR32_GOT18SW:
|
||||||
if ((relocation & 0xfffe0003) != 0
|
if ((relocation & 0xfffe0003) != 0
|
||||||
&& (relocation & 0xfffc0003) != 0xffff0000)
|
&& (relocation & 0xfffc0000) != 0xfffc0000)
|
||||||
return reloc_overflow(module, "R_AVR32_GOT18SW",
|
return reloc_overflow(module, "R_AVR32_GOT18SW",
|
||||||
relocation);
|
relocation);
|
||||||
relocation >>= 2;
|
relocation >>= 2;
|
||||||
|
|
Loading…
Reference in New Issue