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

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

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Ignore vmlinux.lds generated files
  [MIPS] kgdb: Do not call fixup_exception
  [MIPS] RB532: Do not define registers that are already defined
  [MIPS] IP27: Export symbol pcibus_to_node to modules.
  [MIPS] kgdb: s/(void *)0)/NULL/
  [MIPS] kgdb: smp_call_function's 3rd argument is a pointer.
  [MIPS] TXx9: Fix mips_hpt_frequency initialization
  [MIPS] emma2rh: Fix build error by header file inclusion weeding.
  [MIPS] Jazz: Fix build error by header file inclusion weeding.
  [MIPS] Wire up new syscalls.
  [MIPS] Convert printk statements during kernel setup to use severity levels
parents 811da237 3e6259c3

arch/mips/emma2rh/markeins/setup.c

+1 −15
Original line number Diff line number Diff line
@@ -25,23 +25,9 @@ 
#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/initrd.h>

#include <linux/irq.h>

#include <linux/ioport.h>

#include <linux/param.h>	/* for HZ */

#include <linux/root_dev.h>

#include <linux/serial.h>

#include <linux/serial_core.h>



#include <asm/cpu.h>

#include <asm/bootinfo.h>

#include <asm/addrspace.h>



#include <asm/time.h>

#include <asm/bcache.h>

#include <asm/irq.h>

#include <asm/reboot.h>

#include <asm/traps.h>

#include <asm/debug.h>



#include <asm/emma2rh/emma2rh.h>

arch/mips/jazz/setup.c

+1 −12
Original line number Diff line number Diff line
@@ -5,33 +5,22 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1996, 1997, 1998, 2001, 07 by Ralf Baechle

 * Copyright (C) 1996, 1997, 1998, 2001, 07, 08 by Ralf Baechle

 * Copyright (C) 2001 MIPS Technologies, Inc.

 * Copyright (C) 2007 by Thomas Bogendoerfer

 */

#include <linux/eisa.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/mm.h>

#include <linux/console.h>

#include <linux/fb.h>

#include <linux/pm.h>

#include <linux/screen_info.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>



#include <asm/bootinfo.h>

#include <asm/irq.h>

#include <asm/jazz.h>

#include <asm/jazzdma.h>

#include <asm/reboot.h>

#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/time.h>

#include <asm/traps.h>

#include <asm/mc146818-time.h>



extern asmlinkage void jazz_handle_int(void);

arch/mips/kernel/.gitignore

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

arch/mips/kernel/kgdb.c

+2 −5
Original line number Diff line number Diff line
@@ -62,13 +62,13 @@ void arch_kgdb_breakpoint(void) 


static void kgdb_call_nmi_hook(void *ignored)

{

	kgdb_nmicallback(raw_smp_processor_id(), (void *)0);

	kgdb_nmicallback(raw_smp_processor_id(), NULL);

}



void kgdb_roundup_cpus(unsigned long flags)

{

	local_irq_enable();

	smp_call_function(kgdb_call_nmi_hook, NULL, NULL);

	smp_call_function(kgdb_call_nmi_hook, NULL, 0);

	local_irq_disable();

}
@@ -190,9 +190,6 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd, 
	struct pt_regs *regs = args->regs;

	int trap = (regs->cp0_cause & 0x7c) >> 2;



	if (fixup_exception(regs))

		return NOTIFY_DONE;



	/* Userpace events, ignore. */

	if (user_mode(regs))

		return NOTIFY_DONE;

arch/mips/kernel/scall32-o32.S

+6 −0
Original line number Diff line number Diff line
@@ -647,6 +647,12 @@ einval: li v0, -EINVAL 
	sys	sys_timerfd_create	2

	sys	sys_timerfd_gettime	2

	sys	sys_timerfd_settime	4

	sys	sys_signalfd4		4

	sys	sys_eventfd2		2	/* 4325 */

	sys	sys_epoll_create1	1

	sys	sys_dup3		3

	sys	sys_pipe2		2

	sys	sys_inotify_init1	1

	.endm



	/* We pre-compute the number of _instruction_ bytes needed to