Commit 5965087d 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:
  Fix divide by zero error in build_clear_page() and build_copy_page()
  [MIPS] Fix typo in header guard
  [MIPS] Fix build error - Delete debugging crap that crept in with CMP
  [MIPS] Add accessors for random register.
  [MIPS] IP27: misc fixes
  [MIPS] IP27: Fix clockevent setup
  [MIPS] IP27: Fix bootmem memory setup
  [MIPS] remove CONFIG_CPU_R4000 line from Makefile
  [MIPS] Fix check for valid stack pointer during backtrace
  [MIPS] Add missing braces to pte_mkyoung
  [MIPS] R4700: Fix build_tlb_probe_entry
  [MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids.
  [MIPS] Alchemy: export get_au1x00_speed for modules
parents 698f7a4a cd9da13d

arch/mips/au1000/common/clocks.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ unsigned int get_au1x00_speed(void) 
{

	return au1x00_clock;

}

EXPORT_SYMBOL(get_au1x00_speed);



/*

 * The UART baud base is not known at compile time ... if

arch/mips/au1000/common/dbdma.c

+11 −0
Original line number Diff line number Diff line
@@ -216,6 +216,17 @@ u32 au1xxx_ddma_add_device(dbdev_tab_t *dev) 
}

EXPORT_SYMBOL(au1xxx_ddma_add_device);



void au1xxx_ddma_del_device(u32 devid)

{

	dbdev_tab_t *p = find_dbdev_id(devid);



	if (p != NULL) {

		memset(p, 0, sizeof(dbdev_tab_t));

		p->dev_id = ~0;

	}

}

EXPORT_SYMBOL(au1xxx_ddma_del_device);



/* Allocate a channel and return a non-zero descriptor if successful. */

u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,

       void (*callback)(int, void *), void *callparam)

arch/mips/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ obj-$(CONFIG_CPU_LOONGSON2) += r4k_fpu.o r4k_switch.o 
obj-$(CONFIG_CPU_MIPS32)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_MIPS64)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R3000)		+= r2300_fpu.o r2300_switch.o

obj-$(CONFIG_CPU_R4000)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R4300)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R4X00)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R5000)		+= r4k_fpu.o r4k_switch.o

arch/mips/kernel/traps.c

+9 −7
Original line number Diff line number Diff line
@@ -88,16 +88,18 @@ static void show_raw_backtrace(unsigned long reg29) 
#ifdef CONFIG_KALLSYMS

	printk("\n");

#endif

#define IS_KVA01(a) ((((unsigned int)a) & 0xc0000000) == 0x80000000)

	if (IS_KVA01(sp)) {

	while (!kstack_end(sp)) {

			addr = *sp++;

		unsigned long __user *p =

			(unsigned long __user *)(unsigned long)sp++;

		if (__get_user(addr, p)) {

			printk(" (Bad stack address)");

			break;

		}

		if (__kernel_text_address(addr))

			print_ip_sym(addr);

	}

	printk("\n");

}

}



#ifdef CONFIG_KALLSYMS

int raw_show_trace;

arch/mips/mips-boards/generic/time.c

+0 −19
Original line number Diff line number Diff line
@@ -58,27 +58,8 @@ static int mips_cpu_timer_irq; 
static int mips_cpu_perf_irq;

extern int cp0_perfcount_irq;



DEFINE_PER_CPU(unsigned int, tickcount);

#define tickcount_this_cpu __get_cpu_var(tickcount)

static unsigned long ledbitmask;



static void mips_timer_dispatch(void)

{

#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_ATLAS)

	/*

	 * Yes, this is very tacky, won't work as expected with SMTC and

	 * dyntick will break it,

	 * but it gives me a nice warm feeling during debug

	 */

#define LEDBAR 0xbf000408

	if (tickcount_this_cpu++ >= HZ) {

		tickcount_this_cpu = 0;

		change_bit(smp_processor_id(), &ledbitmask);

		smp_wmb(); /* Make sure every one else sees the change */

		/* This will pick up any recent changes made by other CPU's */

		*(unsigned int *)LEDBAR = ledbitmask;

	}

#endif

	do_IRQ(mips_cpu_timer_irq);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE