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

Commit f62378fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents a418500b 6a1ced59

arch/arm/boot/compressed/ofw-shark.c

+1 −1
Original line number Diff line number Diff line
@@ -256,5 +256,5 @@ asmlinkage void ofw_init(ofw_handle_t o, int *nomr, int *pointer) 
	temp[11]='\0';

	mem_len = OF_getproplen(o,phandle, temp);

	OF_getprop(o,phandle, temp, buffer, mem_len);

	(unsigned char) pointer[32] = ((unsigned char *) buffer)[mem_len-2];

	* ((unsigned char *) &pointer[32]) = ((unsigned char *) buffer)[mem_len-2];

}

arch/arm/kernel/traps.c

+3 −0
Original line number Diff line number Diff line
@@ -624,6 +624,9 @@ void __attribute__((noreturn)) __bug(const char *file, int line, void *data) 
		printk(" - extra data = %p", data);

	printk("\n");

	*(int *)0 = 0;



	/* Avoid "noreturn function does return" */

	for (;;);

}

EXPORT_SYMBOL(__bug);

arch/arm/kernel/vmlinux.lds.S

+4 −4
Original line number Diff line number Diff line
@@ -23,20 +23,20 @@ SECTIONS 
			*(.init.text)

			_einittext = .;

		__proc_info_begin = .;

			*(.proc.info)

			*(.proc.info.init)

		__proc_info_end = .;

		__arch_info_begin = .;

			*(.arch.info)

			*(.arch.info.init)

		__arch_info_end = .;

		__tagtable_begin = .;

			*(.taglist)

			*(.taglist.init)

		__tagtable_end = .;

		. = ALIGN(16);

		__setup_start = .;

			*(.init.setup)

		__setup_end = .;

		__early_begin = .;

			*(__early_param)

			*(.early_param.init)

		__early_end = .;

		__initcall_start = .;

			*(.initcall1.init)

arch/arm/mach-s3c2410/mach-anubis.c

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 *

 * Modifications:

 *	02-May-2005 BJD  Copied from mach-bast.c

 *	20-Sep-2005 BJD  Added static to non-exported items

*/



#include <linux/kernel.h>
@@ -232,7 +233,7 @@ static struct s3c24xx_board anubis_board __initdata = { 
	.clocks_count  = ARRAY_SIZE(anubis_clocks)

};



void __init anubis_map_io(void)

static void __init anubis_map_io(void)

{

	/* initialise the clocks */

arch/arm/mach-s3c2410/mach-bast.c

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 *     17-Jul-2005 BJD  Changed to platform device for SuperIO 16550s

 *     25-Jul-2005 BJD  Removed ASIX static mappings

 *     27-Jul-2005 BJD  Ensure maximum frequency of i2c bus

 *     20-Sep-2005 BJD  Added static to non-exported items

*/



#include <linux/kernel.h>
@@ -428,7 +429,7 @@ static struct s3c24xx_board bast_board __initdata = { 
	.clocks_count  = ARRAY_SIZE(bast_clocks)

};



void __init bast_map_io(void)

static void __init bast_map_io(void)

{

	/* initialise the clocks */