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

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

Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux 

Pull OpenRISC updates from Stafford Horne:
 "Openrisc fixes for this 4.13 merge window, there is not really much
  here:

   - include cleanups, one with should reduce build time slightly

   - switch to new toolchain to new (>2 year old) toolchain prefix"

* tag 'openrisc-for-linus' of git://github.com/openrisc/linux:
  openrisc: defconfig: Cleanup from old Kconfig options
  openrisc: explicitly include linux/bug.h in asm/fixmap.h
  openrisc: Switch to use export.h instead of module.h
  openrisc: Change toolchain from or32- to or1k-
parents d691b7e7 2e08a0ef

arch/openrisc/configs/or1ksim_defconfig

+1 −2
Original line number Diff line number Diff line 
CONFIG_CROSS_COMPILE="or32-linux-"

CONFIG_CROSS_COMPILE="or1k-linux-"

CONFIG_NO_HZ=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y
@@ -23,7 +23,6 @@ CONFIG_INET=y 
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

CONFIG_TCP_CONG_ADVANCED=y

# CONFIG_TCP_CONG_BIC is not set

arch/openrisc/include/asm/fixmap.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define FIXADDR_TOP	((unsigned long) (-2*PAGE_SIZE))



#include <linux/kernel.h>

#include <linux/bug.h>

#include <asm/page.h>



/*

arch/openrisc/kernel/or32_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 *      2 of the License, or (at your option) any later version.

 */



#include <linux/module.h>

#include <linux/export.h>

#include <linux/elfcore.h>

#include <linux/sched.h>

#include <linux/in6.h>

arch/openrisc/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/sched/task.h>

#include <linux/sched/task_stack.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/export.h>

#include <linux/mm.h>

#include <linux/stddef.h>

#include <linux/unistd.h>

arch/openrisc/lib/delay.c

+2 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/export.h>

#include <linux/init.h>

#include <asm/param.h>

#include <asm/delay.h>

#include <asm/timex.h>

#include <asm/processor.h>