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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Add regs_return_value().
  [SPARC64]: Kill pcic_present().
  [SPARC]: Kill 'prom_palette'.
  [ATYFB]: Kill 'prom_palette' sparc code.
  [SPARC64]: Kill 'prom_keyboard'.
  [SPARC]: Kill extern decl of 'panic_setup'.
  [SPARC64]: Delete 'boot_flags'.
  [SPARC64]: Kill unused function 'kernel_enter_debugger'.
  [SPARC64] arch/sparc64/kernel/unaligned.c: Use time_* macros
  [SPARC64]: Always register a PROM based early console.
  [SPARC64]: Update defconfig.
  [SPARC64]: Add -mtune=ultrasparc3 if possible.
  [SPARC64]: Remove Makefile code for ancient gcc and binutils.
  [SPARC64]: Remove DEBUG_BOOTMEM.
  [SPARC64]: Use shorter "get_zeroed_page" call.
  [SPARC]: Use shorter form of "get_zeroed_page".
  [SPARC]: video/cg14.c and video/sbuslib.c build fixes
parents 07ce198a f6d091e0

arch/sparc/kernel/process.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -141,16 +141,12 @@ void cpu_idle(void) 




extern char reboot_command [];

extern char reboot_command [];





extern void (*prom_palette)(int);



/* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */

/* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */

void machine_halt(void)

void machine_halt(void)

{

{

	local_irq_enable();

	local_irq_enable();

	mdelay(8);

	mdelay(8);

	local_irq_disable();

	local_irq_disable();

	if (prom_palette)

		prom_palette (1);

	prom_halt();

	prom_halt();

	panic("Halt failed!");

	panic("Halt failed!");

}

}
@@ -165,8 +161,6 @@ void machine_restart(char * cmd) 




	p = strchr (reboot_command, '\n');

	p = strchr (reboot_command, '\n');

	if (p) *p = 0;

	if (p) *p = 0;

	if (prom_palette)

		prom_palette (1);

	if (cmd)

	if (cmd)

		prom_reboot(cmd);

		prom_reboot(cmd);

	if (*reboot_command)

	if (*reboot_command)

arch/sparc/kernel/setup.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ struct screen_info screen_info = { 
 */

 */





extern unsigned long trapbase;

extern unsigned long trapbase;

void (*prom_palette)(int);





/* Pretty sick eh? */

/* Pretty sick eh? */

void prom_sync_me(void)

void prom_sync_me(void)
@@ -80,8 +79,6 @@ void prom_sync_me(void) 
			     "nop\n\t"

			     "nop\n\t"

			     "nop\n\t" : : "r" (&trapbase));

			     "nop\n\t" : : "r" (&trapbase));





	if (prom_palette)

		prom_palette(1);

	prom_printf("PROM SYNC COMMAND...\n");

	prom_printf("PROM SYNC COMMAND...\n");

	show_free_areas();

	show_free_areas();

	if(current->pid != 0) {

	if(current->pid != 0) {
@@ -191,7 +188,6 @@ extern int prom_probe_memory(void); 
extern void sun4c_probe_vac(void);

extern void sun4c_probe_vac(void);

extern char cputypval;

extern char cputypval;

extern unsigned long start, end;

extern unsigned long start, end;

extern void panic_setup(char *, int *);





extern unsigned short root_flags;

extern unsigned short root_flags;

extern unsigned short root_dev;

extern unsigned short root_dev;

arch/sparc/mm/sun4c.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1941,9 +1941,7 @@ static pte_t *sun4c_pte_alloc_one_kernel(struct mm_struct *mm, unsigned long add 
	if ((pte = sun4c_pte_alloc_one_fast(mm, address)) != NULL)

	if ((pte = sun4c_pte_alloc_one_fast(mm, address)) != NULL)

		return pte;

		return pte;





	pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);

	pte = (pte_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);

	if (pte)

		memset(pte, 0, PAGE_SIZE);

	return pte;

	return pte;

}

}

arch/sparc/prom/misc.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -45,9 +45,6 @@ prom_feval(char *fstring) 
	spin_unlock_irqrestore(&prom_lock, flags);

	spin_unlock_irqrestore(&prom_lock, flags);

}

}





/* We want to do this more nicely some day. */

extern void (*prom_palette)(int);



/* Drop into the prom, with the chance to continue with the 'go'

/* Drop into the prom, with the chance to continue with the 'go'

 * prom command.

 * prom command.

 */

 */
@@ -58,8 +55,6 @@ prom_cmdline(void) 
	extern void install_linux_ticker(void);

	extern void install_linux_ticker(void);

	unsigned long flags;

	unsigned long flags;





	if (prom_palette)

		prom_palette (1);

	spin_lock_irqsave(&prom_lock, flags);

	spin_lock_irqsave(&prom_lock, flags);

	install_obp_ticker();

	install_obp_ticker();

	(*(romvec->pv_abort))();

	(*(romvec->pv_abort))();
@@ -69,8 +64,6 @@ prom_cmdline(void) 
#ifdef CONFIG_SUN_AUXIO

#ifdef CONFIG_SUN_AUXIO

	set_auxio(AUXIO_LED, 0);

	set_auxio(AUXIO_LED, 0);

#endif

#endif

	if (prom_palette)

		prom_palette (0);

}

}





/* Drop into the prom, but completely terminate the program.

/* Drop into the prom, but completely terminate the program.

arch/sparc64/Kconfig.debug

+0 −4
Original line number Original line Diff line number Diff line
@@ -23,10 +23,6 @@ config STACK_DEBUG 
	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL

	bool "Stack Overflow Detection Support"

	bool "Stack Overflow Detection Support"





config DEBUG_BOOTMEM

	depends on DEBUG_KERNEL

	bool "Debug BOOTMEM initialization"



config DEBUG_PAGEALLOC

config DEBUG_PAGEALLOC

	bool "Debug page memory allocations"

	bool "Debug page memory allocations"

	depends on DEBUG_KERNEL && !HIBERNATION

	depends on DEBUG_KERNEL && !HIBERNATION