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

Commit a21b0696 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] Fix wrong checksum calculation on 64-bit MIPS
  [MIPS] VPE loader: Initialize lists before they're actually being used ...
  [MIPS] Fix reported amount of freed memory - it's in kB not bytes
  [MIPS] vr41xx: need one more nop with mtc0_tlbw_hazard()
  [MIPS] SMTC: Fix module build by exporting symbol
  [MIPS] SMTC: Fix TLB sizing bug for TLB of 64 >= entries
  [MIPS] Fix APM build
  [MIPS] There is no __GNUC_MAJOR__
parents 717d44e8 66218da2

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ LDFLAGS += -m $(ld-emul) 


ifdef CONFIG_MIPS

CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \

	egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \

	egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \

	sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/")

ifdef CONFIG_64BIT

CHECKFLAGS		+= -m64

arch/mips/dec/prom/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ unsigned long __init prom_free_prom_memory(void) 
		addr += PAGE_SIZE;

	}



	printk("Freeing unused PROM memory: %ldk freed\n",

	printk("Freeing unused PROM memory: %ldkb freed\n",

	       (end - PAGE_SIZE) >> 10);



	return end - PAGE_SIZE;

arch/mips/kernel/smtc.c

+8 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/sched.h>

#include <linux/cpumask.h>

#include <linux/interrupt.h>

#include <linux/module.h>



#include <asm/cpu.h>

#include <asm/processor.h>
@@ -270,9 +271,12 @@ void smtc_configure_tlb(void) 
		 * of their initialization in smtc_cpu_setup().

		 */



		tlbsiz = tlbsiz & 0x3f;	/* MIPS32 limits TLB indices to 64 */

		cpu_data[0].tlbsize = tlbsiz;

		/* MIPS32 limits TLB indices to 64 */

		if (tlbsiz > 64)

			tlbsiz = 64;

		cpu_data[0].tlbsize = current_cpu_data.tlbsize = tlbsiz;

		smtc_status |= SMTC_TLB_SHARED;

		local_flush_tlb_all();



		printk("TLB of %d entry pairs shared by %d VPEs\n",

			tlbsiz, vpes);
@@ -1044,6 +1048,8 @@ void smtc_ipi_replay(void) 
	}

}



EXPORT_SYMBOL(smtc_ipi_replay);



void smtc_idle_loop_hook(void)

{

#ifdef SMTC_IDLE_HOOK_DEBUG

arch/mips/kernel/vpe.c

+5 −4
Original line number Diff line number Diff line
@@ -139,13 +139,16 @@ struct tc { 
	struct list_head list;

};



struct vpecontrol_ {

struct {

	/* Virtual processing elements */

	struct list_head vpe_list;



	/* Thread contexts */

	struct list_head tc_list;

} vpecontrol;

} vpecontrol = {

	.vpe_list = LIST_HEAD_INIT(vpecontrol.vpe_list),

	.tc_list = LIST_HEAD_INIT(vpecontrol.tc_list)

};



static void release_progmem(void *ptr);

/* static __attribute_used__ void dump_vpe(struct vpe * v); */
@@ -1388,8 +1391,6 @@ static int __init vpe_module_init(void) 


	/* dump_mtregs(); */



	INIT_LIST_HEAD(&vpecontrol.vpe_list);

	INIT_LIST_HEAD(&vpecontrol.tc_list);



	val = read_c0_mvpconf0();

	for (i = 0; i < ((val & MVPCONF0_PTC) + 1); i++) {

arch/mips/mm/init.c

+2 −1
Original line number Diff line number Diff line
@@ -501,7 +501,8 @@ void free_initmem(void) 


	freed = prom_free_prom_memory();

	if (freed)

		printk(KERN_INFO "Freeing firmware memory: %ldk freed\n",freed);

		printk(KERN_INFO "Freeing firmware memory: %ldkb freed\n",

		       freed >> 10);



	free_init_pages("unused kernel memory",

			__pa_symbol(&__init_begin),