Skip to content

L
linux
Commit 4068b00e authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  avr32, exec: remove redundant set_fs(USER_DS)
  avr32: make intc_resume() return void to conform to syscore_ops
  avr32: add some more at91 to cpu.h definition
  avr32: set CONFIG_CC_OPTIMIZE_FOR_SIZE=y for all defconfigs
  avr32/at32ap: fix mapping of platform device id for USART
  avr32: fix use of non-existing portnr variable in at32_map_usart()
parents f39e8409 ff71db2f
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 5 deletions
arch/avr32/configs/atngw100_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atngw100_evklcd100_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atngw100_evklcd101_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atngw100_mrmt_defconfig
View file @ 4068b00e
...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y ...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_SLUB_DEBUG is not set # CONFIG_SLUB_DEBUG is not set
......
arch/avr32/configs/atngw100mkii_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atngw100mkii_evklcd100_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atngw100mkii_evklcd101_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atstk1002_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atstk1003_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atstk1004_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/atstk1006_defconfig
View file @ 4068b00e
...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y ...@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/favr-32_defconfig
View file @ 4068b00e
...@@ -6,6 +6,7 @@ CONFIG_LOG_BUF_SHIFT=14 ...@@ -6,6 +6,7 @@ CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/hammerhead_defconfig
View file @ 4068b00e
...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y ...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/configs/merisc_defconfig
View file @ 4068b00e
...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y ...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
CONFIG_MODULES=y CONFIG_MODULES=y
......
arch/avr32/configs/mimc200_defconfig
View file @ 4068b00e
...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y ...@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set # CONFIG_BASE_FULL is not set
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
......
arch/avr32/include/asm/processor.h
View file @ 4068b00e
...@@ -131,7 +131,6 @@ struct thread_struct { ...@@ -131,7 +131,6 @@ struct thread_struct {
*/ */
#define start_thread(regs, new_pc, new_sp) \ #define start_thread(regs, new_pc, new_sp) \
do { \ do { \
set_fs(USER_DS); \
memset(regs, 0, sizeof(*regs)); \ memset(regs, 0, sizeof(*regs)); \
regs->sr = MODE_USER; \ regs->sr = MODE_USER; \
regs->pc = new_pc & ~1; \ regs->pc = new_pc & ~1; \
......
arch/avr32/mach-at32ap/at32ap700x.c
View file @ 4068b00e
...@@ -1043,8 +1043,9 @@ void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags) ...@@ -1043,8 +1043,9 @@ void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags)
data->regs = (void __iomem *)pdev->resource[0].start; data->regs = (void __iomem *)pdev->resource[0].start;
} }
pdev->id = line;
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
pdata->num = portnr; pdata->num = line;
at32_usarts[line] = pdev; at32_usarts[line] = pdev;
} }
......
arch/avr32/mach-at32ap/include/mach/cpu.h
View file @ 4068b00e
...@@ -31,8 +31,20 @@ ...@@ -31,8 +31,20 @@
#define cpu_is_at91sam9263() (0) #define cpu_is_at91sam9263() (0)
#define cpu_is_at91sam9rl() (0) #define cpu_is_at91sam9rl() (0)
#define cpu_is_at91cap9() (0) #define cpu_is_at91cap9() (0)
#define cpu_is_at91cap9_revB() (0)
#define cpu_is_at91cap9_revC() (0)
#define cpu_is_at91sam9g10() (0) #define cpu_is_at91sam9g10() (0)
#define cpu_is_at91sam9g20() (0)
#define cpu_is_at91sam9g45() (0) #define cpu_is_at91sam9g45() (0)
#define cpu_is_at91sam9g45es() (0) #define cpu_is_at91sam9g45es() (0)
#define cpu_is_at91sam9m10() (0)
#define cpu_is_at91sam9g46() (0)
#define cpu_is_at91sam9m11() (0)
#define cpu_is_at91sam9x5() (0)
#define cpu_is_at91sam9g15() (0)
#define cpu_is_at91sam9g35() (0)
#define cpu_is_at91sam9x35() (0)
#define cpu_is_at91sam9g25() (0)
#define cpu_is_at91sam9x25() (0)
#endif /* __ASM_ARCH_CPU_H */ #endif /* __ASM_ARCH_CPU_H */
arch/avr32/mach-at32ap/intc.c
View file @ 4068b00e
...@@ -167,14 +167,12 @@ static int intc_suspend(void) ...@@ -167,14 +167,12 @@ static int intc_suspend(void)
return 0; return 0;
} }
static int intc_resume(void) static void intc_resume(void)
{ {
int i; int i;
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
intc_writel(&intc0, INTPR0 + 4 * i, intc0.saved_ipr[i]); intc_writel(&intc0, INTPR0 + 4 * i, intc0.saved_ipr[i]);
return 0;
} }
#else #else
#define intc_suspend NULL #define intc_suspend NULL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7