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

Commit 9e72ea82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok
  [SPARC32]: Fix bug in sparc optimized memset.
  [SPARC64]: Update defconfig.
  [SPARC]: Add missing NOTES section.
  [SPARC32]: missing exports
  [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
parents 03746bad 1966287d

arch/sparc/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

CONFIG_HW_RANDOM=m

CONFIG_RTC=m

CONFIG_JS_RTC=m

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_DRM is not set

arch/sparc/kernel/sparc_ksyms.c

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_one)); 
EXPORT_SYMBOL(BTFIXUP_CALL(mmu_release_scsi_sgl));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_release_scsi_one));



EXPORT_SYMBOL(BTFIXUP_CALL(pgprot_noncached));



#ifdef CONFIG_SBUS

EXPORT_SYMBOL(sbus_root);

EXPORT_SYMBOL(dma_chain);
@@ -260,6 +262,7 @@ EXPORT_SYMBOL(__memmove); 
/* Moving data to/from userspace. */

EXPORT_SYMBOL(__copy_user);

EXPORT_SYMBOL(__strncpy_from_user);

EXPORT_SYMBOL(__strnlen_user);



/* Networking helper routines. */

EXPORT_SYMBOL(__csum_partial_copy_sparc_generic);

arch/sparc/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ SECTIONS 
  __ex_table : { *(__ex_table) }

  __stop___ex_table = .;



  NOTES



  . = ALIGN(4096);

  __init_begin = .;

  _sinittext = .;

arch/sparc/lib/memset.S

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ __bzero: 
8:

	 add	%o0, 1, %o0

	subcc	%o1, 1, %o1

	bne,a	8b

	bne	8b

	 EX(stb	%g3, [%o0 - 1], add %o1, 1)

0:

	retl

arch/sparc/prom/printf.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>



#include <asm/openprom.h>

#include <asm/oplib.h>
@@ -44,3 +45,4 @@ prom_printf(char *fmt, ...) 


	prom_write(ppbuf, i);

}

EXPORT_SYMBOL(prom_printf);