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

Commit 1cce92ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: nmi_enter() without nmi_exit()
  avr32: fix sys_sync_file_range() call convention
  avr32: add generic_find_next_le_bit bit function
  avr32: add .gitignore files
  atstk1000: fix build breakage with BOARD_ATSTK100X_SW2_CUSTOM=y
parents 79d57ab9 3d431a74

arch/avr32/boards/atstk1000/atstk1002.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int __init atstk1002_init(void) 
#ifdef CONFIG_BOARD_ATSTK100X_SPI1

	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

#endif

#ifndef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM

#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_add_device_mci(0, MCI_PDATA);

#endif

#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM

arch/avr32/boot/images/.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
uImage

uImage.srec

vmlinux.cso

sfdwarf.log

arch/avr32/kernel/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
vmlinux.lds

arch/avr32/kernel/avr32_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ EXPORT_SYMBOL(find_first_zero_bit); 
EXPORT_SYMBOL(find_next_zero_bit);

EXPORT_SYMBOL(find_first_bit);

EXPORT_SYMBOL(find_next_bit);

EXPORT_SYMBOL(generic_find_next_le_bit);

EXPORT_SYMBOL(generic_find_next_zero_le_bit);



/* I/O primitives (lib/io-*.S) */

arch/avr32/kernel/syscall-stubs.S

+9 −0
Original line number Diff line number Diff line
@@ -109,3 +109,12 @@ __sys_epoll_pwait: 
	rcall	sys_epoll_pwait

	sub	sp, -4

	popm	pc



	.global __sys_sync_file_range

	.type	__sys_sync_file_range,@function

__sys_sync_file_range:

	pushm	lr

	st.w	--sp, ARG6

	rcall	sys_sync_file_range

	sub	sp, -4

	popm	pc