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

Commit 3a81a6e7 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:
 "What's in there: a number of MIPS fixes and touchups.  The most
  important change in this pull request is Kautuk Consul's port of
  changes to do_page_fault which fix a hang that affects some
  configurations.  Still not quite ready for a release, there are
  problems with 64-bit platforms."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: traps.c: Fix typo
  MIPS: PowerTV: Fix defconfigs for coverage builds
  MIPS: Netlogic: Fix defconfigs for coverage builds
  MIPS: ATH79: Avoid a kernel bug on AR913X
  MIPS: PCI: use list_for_each_entry() for bus->devices traversal
  MIPS: fault.c: Port OOM changes to do_page_fault
  MIPS: vmlinux.lds.S: remove duplicate _sdata symbol
  MIPS: Alchemy: Increase minimum timeout for 32kHz timer.
  MIPS: txx9 7segled fix struct device has no member
  MIPS: Alchemy: Update Au1300 inlined GPIO macros
  MIPS: Remove temporary kludge from <asm/page.h>
  MIPS: BMIPS: smp-bmips.c does not need to include version.h
parents cd2934a3 f232c7e8

arch/mips/alchemy/common/time.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int __init alchemy_time_init(unsigned int m2int) 
	cd->shift = 32;

	cd->mult = div_sc(32768, NSEC_PER_SEC, cd->shift);

	cd->max_delta_ns = clockevent_delta2ns(0xffffffff, cd);

	cd->min_delta_ns = clockevent_delta2ns(8, cd);	/* ~0.25ms */

	cd->min_delta_ns = clockevent_delta2ns(9, cd);	/* ~0.28ms */

	clockevents_register_device(cd);

	setup_irq(m2int, &au1x_rtcmatch2_irqaction);

arch/mips/ath79/dev-wmac.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void __init ath79_register_wmac(u8 *cal_data) 
{

	if (soc_is_ar913x())

		ar913x_wmac_setup();

	if (soc_is_ar933x())

	else if (soc_is_ar933x())

		ar933x_wmac_setup();

	else

		BUG();

arch/mips/configs/nlm_xlp_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CONFIG_HIGH_RES_TIMERS=y 
# CONFIG_SECCOMP is not set

CONFIG_USE_OF=y

CONFIG_EXPERIMENTAL=y

CONFIG_CROSS_COMPILE="mips-linux-gnu-"

CONFIG_CROSS_COMPILE=""

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -22,7 +22,7 @@ CONFIG_AUDIT=y 
CONFIG_CGROUPS=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="usr/dev_file_list usr/rootfs.xlp"

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_INITRAMFS_COMPRESSION_LZMA=y

arch/mips/configs/nlm_xlr_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CONFIG_HIGH_RES_TIMERS=y 
CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_KEXEC=y

CONFIG_EXPERIMENTAL=y

CONFIG_CROSS_COMPILE="mips-linux-gnu-"

CONFIG_CROSS_COMPILE=""

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -22,7 +22,7 @@ CONFIG_AUDIT=y 
CONFIG_NAMESPACES=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="usr/dev_file_list usr/rootfs.xlr"

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_INITRAMFS_COMPRESSION_GZIP=y

arch/mips/configs/powertv_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ CONFIG_HZ_1000=y 
CONFIG_PREEMPT=y

# CONFIG_SECCOMP is not set

CONFIG_EXPERIMENTAL=y

CONFIG_CROSS_COMPILE="mips-linux-"

CONFIG_CROSS_COMPILE=""

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=16