diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 13:58:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 13:58:49 -0700 |
| commit | 37949075ab628e8ef36a877108c2d95b13221cc5 (patch) | |
| tree | a4b26ff06ed3680384f66e0aba08fd4945d11311 /arch/openrisc | |
| parent | d691b7e7d1b5186eae62fd32adee65d3316bfdf6 (diff) | |
| parent | 2e08a0ef7627c1c1619442494d753de0c5b22091 (diff) | |
| download | blackbird-op-linux-37949075ab628e8ef36a877108c2d95b13221cc5.tar.gz blackbird-op-linux-37949075ab628e8ef36a877108c2d95b13221cc5.zip | |
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-
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/configs/or1ksim_defconfig | 3 | ||||
| -rw-r--r-- | arch/openrisc/include/asm/fixmap.h | 1 | ||||
| -rw-r--r-- | arch/openrisc/kernel/or32_ksyms.c | 2 | ||||
| -rw-r--r-- | arch/openrisc/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/openrisc/lib/delay.c | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/arch/openrisc/configs/or1ksim_defconfig b/arch/openrisc/configs/or1ksim_defconfig index 42fe5303a370..a73aa90501be 100644 --- a/arch/openrisc/configs/or1ksim_defconfig +++ b/arch/openrisc/configs/or1ksim_defconfig @@ -1,4 +1,4 @@ -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 diff --git a/arch/openrisc/include/asm/fixmap.h b/arch/openrisc/include/asm/fixmap.h index 52733416c1f3..5a0159546f9e 100644 --- a/arch/openrisc/include/asm/fixmap.h +++ b/arch/openrisc/include/asm/fixmap.h @@ -27,6 +27,7 @@ #define FIXADDR_TOP ((unsigned long) (-2*PAGE_SIZE)) #include <linux/kernel.h> +#include <linux/bug.h> #include <asm/page.h> /* diff --git a/arch/openrisc/kernel/or32_ksyms.c b/arch/openrisc/kernel/or32_ksyms.c index ee3e604959e1..d7260fdb0351 100644 --- a/arch/openrisc/kernel/or32_ksyms.c +++ b/arch/openrisc/kernel/or32_ksyms.c @@ -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> diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c index f9b77003f113..8739b6d75005 100644 --- a/arch/openrisc/kernel/process.c +++ b/arch/openrisc/kernel/process.c @@ -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> diff --git a/arch/openrisc/lib/delay.c b/arch/openrisc/lib/delay.c index c82b09f4a106..8b13fdf43ec6 100644 --- a/arch/openrisc/lib/delay.c +++ b/arch/openrisc/lib/delay.c @@ -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> |
