diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-21 11:00:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-21 11:00:17 -0700 |
| commit | 1b74b4600d0318fd81aceb5a7b7d10432bc2306b (patch) | |
| tree | c815fa35ed5f55ad14b782d0239a0bc3bb44023e /arch/m68k/kernel/setup_mm.c | |
| parent | 90ea15b7c9729609116ac513ac48e9a58992bf50 (diff) | |
| parent | 0d52a01a266ba21840c7cb02e1de39c503759dda (diff) | |
Merge tag 'm68k-for-v5.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- Fix frame buffers backed by deferred I/O
- defconfig updates
- Minor fixes and improvements
* tag 'm68k-for-v5.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Disable fbdev on Sun3/3x
m68k: defconfig: Update defconfigs for v5.17-rc3
m68k: mm: Remove check for VM_IO to fix deferred I/O
m68k: Add asm/config.h
Diffstat (limited to 'arch/m68k/kernel/setup_mm.c')
| -rw-r--r-- | arch/m68k/kernel/setup_mm.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 49e573b94326..8228275aae3e 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -47,6 +47,7 @@ #endif #include <asm/macintosh.h> #include <asm/natfeat.h> +#include <asm/config.h> #if !FPSTATESIZE || !NR_IRQS #warning No CPU/platform type selected, your kernel will not work! @@ -113,28 +114,6 @@ EXPORT_SYMBOL(isa_type); EXPORT_SYMBOL(isa_sex); #endif -extern int amiga_parse_bootinfo(const struct bi_record *); -extern int atari_parse_bootinfo(const struct bi_record *); -extern int mac_parse_bootinfo(const struct bi_record *); -extern int q40_parse_bootinfo(const struct bi_record *); -extern int bvme6000_parse_bootinfo(const struct bi_record *); -extern int mvme16x_parse_bootinfo(const struct bi_record *); -extern int mvme147_parse_bootinfo(const struct bi_record *); -extern int hp300_parse_bootinfo(const struct bi_record *); -extern int apollo_parse_bootinfo(const struct bi_record *); - -extern void config_amiga(void); -extern void config_atari(void); -extern void config_mac(void); -extern void config_sun3(void); -extern void config_apollo(void); -extern void config_mvme147(void); -extern void config_mvme16x(void); -extern void config_bvme6000(void); -extern void config_hp300(void); -extern void config_q40(void); -extern void config_sun3x(void); - #define MASK_256K 0xfffc0000 extern void paging_init(void); |