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

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

Pull MIPS fixes from Ralf Baechle:
 "A collection of fixes pretty much across the MIPS code.  Even the
  change to include/linux/signal.h by David Howells' 2a148698 ("Fix
  breakage in MIPS siginfo handling") should be considered MIPS-specific
  as it touches an ifdefed segment that is only relevant to MIPS and
  which unfortunately can't be made to go away entirely."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  Fix breakage in MIPS siginfo handling
  Revert "MIPS: BCM63XX: Call board_register_device from device_initcall()"
  MIPS: BCM63XX: Make nvram checksum failure non fatal
  MIPS: Fix code generation for non-DSP capable CPUs
  MIPS: Fix inconsistent formatting inside /proc/cpuinfo
  MIPS: SEAD3: Enable LL/SC.
  MIPS: Get rid of CONFIG_CPU_HAS_LLSC again
  MIPS: Add dependencies for HAVE_ARCH_TRANSPARENT_HUGEPAGE
  MIPS: VR4133: Fix probe for LL/SC.
  MIPS: Fix logic errors in bitops.c
  MIPS: Use CONFIG_CPU_MIPSR2 in csum_partial.S
  MIPS: compat: Return same error ENOSYS as native for invalid operation.
parents 2dc958fa 2a148698

arch/mips/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ config MIPS 
	select HAVE_KRETPROBES

	select HAVE_KRETPROBES

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DEBUG_KMEMLEAK

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select RTC_LIB if !MACH_LOONGSON

	select RTC_LIB if !MACH_LOONGSON

	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_ATOMIC64 if !64BIT

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
@@ -1493,7 +1493,6 @@ config CPU_XLP 
	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HIGHMEM

	select CPU_HAS_LLSC

	select WEAK_ORDERING

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select WEAK_REORDERING_BEYOND_LLSC

	select CPU_HAS_PREFETCH

	select CPU_HAS_PREFETCH

arch/mips/bcm63xx/boards/board_bcm963xx.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -745,10 +745,7 @@ void __init board_prom_init(void) 
		strcpy(cfe_version, "unknown");

		strcpy(cfe_version, "unknown");

	printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);

	printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);





	if (bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET)) {

	bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);

		printk(KERN_ERR PFX "invalid nvram checksum\n");

		return;

	}





	board_name = bcm63xx_nvram_get_name();

	board_name = bcm63xx_nvram_get_name();

	/* find board by name */

	/* find board by name */

arch/mips/bcm63xx/nvram.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ struct bcm963xx_nvram { 
static struct bcm963xx_nvram nvram;

static struct bcm963xx_nvram nvram;

static int mac_addr_used;

static int mac_addr_used;





int __init bcm63xx_nvram_init(void *addr)

void __init bcm63xx_nvram_init(void *addr)

{

{

	unsigned int check_len;

	unsigned int check_len;

	u32 crc, expected_crc;

	u32 crc, expected_crc;
@@ -60,9 +60,8 @@ int __init bcm63xx_nvram_init(void *addr) 
	crc = crc32_le(~0, (u8 *)&nvram, check_len);

	crc = crc32_le(~0, (u8 *)&nvram, check_len);





	if (crc != expected_crc)

	if (crc != expected_crc)

		return -EINVAL;

		pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",



			expected_crc, crc);

	return 0;

}

}





u8 *bcm63xx_nvram_get_name(void)

u8 *bcm63xx_nvram_get_name(void)

arch/mips/bcm63xx/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -157,4 +157,4 @@ int __init bcm63xx_register_devices(void) 
	return board_register_devices();

	return board_register_devices();

}

}





device_initcall(bcm63xx_register_devices);
 
arch_initcall(bcm63xx_register_devices);

arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -9,10 +9,8 @@ 
 *

 *

 * Initialized the local nvram copy from the target address and checks

 * Initialized the local nvram copy from the target address and checks

 * its checksum.

 * its checksum.

 *

 * Returns 0 on success.

 */

 */

int __init bcm63xx_nvram_init(void *nvram);

void bcm63xx_nvram_init(void *nvram);





/**

/**

 * bcm63xx_nvram_get_name() - returns the board name according to nvram

 * bcm63xx_nvram_get_name() - returns the board name according to nvram

CRA Git | Maintained and supported by SUSTech CRA and CCSE