Commit 81c20b96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Octeon: Place cnmips_cu2_setup in __init memory.
  MIPS: Don't place cu2 notifiers in __cpuinitdata
  MIPS: Calculate VMLINUZ_LOAD_ADDRESS based on the length of vmlinux.bin
  MIPS: Alchemy: Resolve prom section mismatches
  MIPS: Fix syscall 64 bit number comments.
  MIPS: Hookup fanotify_init, fanotify_mark, and prlimit64 syscalls.
  MIPS: TX49xx: Rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN
  MIPS: N32: Fix getdents64 syscall for n32
  MIPS: Remove pr_<level> uses of KERN_<level>
  MIPS: PNX8550: Sort out machine halt, restart and powerdown functions.
  MIPS: GIC: Remove dependencies from Malta files.
  MIPS: Kconfig: Fix and clarify kconfig help text for VSMP and SMTC.
  MIPS: DMA: Fix computation of DMA flags from device's coherent_dma_mask.
  MIPS: Audit: Fix hang in entry.S.
  MIPS: Document why RELOC_HIDE is there.
  MIPS: Octeon: Determine if helper needs to be built
  MIPS: Use generic atomic64 for 32-bit kernels
  MIPS: RM7000: Symbol should be static
  MIPS: kspd: Adjust confusing if indentation
  MIPS: Fix a typo.
parents 089eed29 158d6742

arch/mips/Kconfig

+19 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config MIPS 
	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select RTC_LIB if !MACH_LOONGSON

	select GENERIC_ATOMIC64 if !64BIT



mainmenu "Linux/MIPS Kernel Configuration"
@@ -1646,8 +1647,16 @@ config MIPS_MT_SMP 
	select SYS_SUPPORTS_SMP

	select SMP_UP

	help

	  This is a kernel model which is also known a VSMP or lately

	  has been marketesed into SMVP.

	  This is a kernel model which is known a VSMP but lately has been

	  marketesed into SMVP.

	  Virtual SMP uses the processor's VPEs  to implement virtual

	  processors. In currently available configuration of the 34K processor

	  this allows for a dual processor. Both processors will share the same

	  primary caches; each will obtain the half of the TLB for it's own

	  exclusive use. For a layman this model can be described as similar to

	  what Intel calls Hyperthreading.



	  For further information see http://www.linux-mips.org/wiki/34K#VSMP



config MIPS_MT_SMTC

	bool "SMTC: Use all TCs on all VPEs for SMP"
@@ -1664,6 +1673,14 @@ config MIPS_MT_SMTC 
	help

	  This is a kernel model which is known a SMTC or lately has been

	  marketesed into SMVP.

	  is presenting the available TC's of the core as processors to Linux.

	  On currently available 34K processors this means a Linux system will

	  see up to 5 processors. The implementation of the SMTC kernel differs

	  significantly from VSMP and cannot efficiently coexist in the same

	  kernel binary so the choice between VSMP and SMTC is a compile time

	  decision.



	  For further information see http://www.linux-mips.org/wiki/34K#SMTC



endchoice

arch/mips/alchemy/common/prom.c

+2 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int prom_argc; 
char **prom_argv;

char **prom_envp;



void prom_init_cmdline(void)

void __init prom_init_cmdline(void)

{

	int i;
@@ -104,7 +104,7 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str) 
	}

}



int prom_get_ethernet_addr(char *ethernet_addr)

int __init prom_get_ethernet_addr(char *ethernet_addr)

{

	char *ethaddr_str;
@@ -123,7 +123,6 @@ int prom_get_ethernet_addr(char *ethernet_addr) 


	return 0;

}

EXPORT_SYMBOL(prom_get_ethernet_addr);



void __init prom_free_prom_memory(void)

{

arch/mips/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE 
hostprogs-y := calc_vmlinuz_load_addr



VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \

		$(objtree)/$(KBUILD_IMAGE) $(VMLINUX_LOAD_ADDRESS))

		$(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))



vmlinuzobjs-y += $(obj)/piggy.o

arch/mips/cavium-octeon/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -83,3 +83,7 @@ config ARCH_SPARSEMEM_ENABLE 
	def_bool y

	select SPARSEMEM_STATIC

	depends on CPU_CAVIUM_OCTEON



config CAVIUM_OCTEON_HELPER

	def_bool y

	depends on OCTEON_ETHERNET || PCI

arch/mips/cavium-octeon/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int cnmips_cu2_call(struct notifier_block *nfb, unsigned long action, 
	return NOTIFY_OK;		/* Let default notifier send signals */

}



static int cnmips_cu2_setup(void)

static int __init cnmips_cu2_setup(void)

{

	return cu2_notifier(cnmips_cu2_call, 0);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE