Pull m68k updates from Geert Uytterhoeven: - pagetable layout rewrite, to facilitate global READ_ONCE() rework - Zorro (Amiga) and DIO (HP 9000/300) bus cleanups - defconfig updates - minor cleanups and fixes * tag 'm68k-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (23 commits) m68k: defconfig: Update defconfigs for v5.6-rc4 zorro: Replace zero-length array with flexible-array member m68k: Switch to asm-generic/hardirq.h fbdev: c2p: Use BUILD_BUG() instead of custom solution dio: Remove unused dio_dev_driver() dio: Fix dio_bus_match() kerneldoc dio: Make dio_match_device() static zorro: Move zorro_bus_type to bus-private header file zorro: Remove unused zorro_dev_driver() zorro: Use zorro_match_device() helper in zorro_bus_match() zorro: Fix zorro_bus_match() kerneldoc zorro: Make zorro_match_device() static m68k: Fix Kconfig indentation m68k: mm: Change ColdFire pgtable_t m68k: mm: Fully initialize the page-table allocator m68k: mm: Extend table allocator for multiple sizes m68k: mm: Use table allocator for pgtables m68k: mm: Improve kernel_page_table() m68k: mm: Restructure Motorola MMU page-table layout m68k: mm: Move the pointer table allocator to motorola.c ...
Showing the changes to include/linux (2 of 33 files). Show all
Unified · Split
| @@ -247,11 +247,6 @@ extern int dio_create_sysfs_dev_files(struct dio_dev *); · 246 unmodified lines | |||
| 247 | /* New-style probing */ | 247 | /* New-style probing */ |
| 248 | extern int dio_register_driver(struct dio_driver *); | 248 | extern int dio_register_driver(struct dio_driver *); |
| 249 | extern void dio_unregister_driver(struct dio_driver *); | 249 | extern void dio_unregister_driver(struct dio_driver *); |
| 250 | extern const struct dio_device_id *dio_match_device(const struct dio_device_id *ids, const struct dio_dev *z); | ||
| 251 | static inline struct dio_driver *dio_dev_driver(const struct dio_dev *d) | ||
| 252 | { | ||
| 253 | return d->driver; | ||
| 254 | } | ||
| 255 | 250 | ||
| 256 | #define dio_resource_start(d) ((d)->resource.start) | 251 | #define dio_resource_start(d) ((d)->resource.start) |
| 257 | #define dio_resource_end(d) ((d)->resource.end) | 252 | #define dio_resource_end(d) ((d)->resource.end) |
| @@ -40,13 +40,6 @@ struct zorro_dev { · 39 unmodified lines | |||
| 40 | #define to_zorro_dev(n) container_of(n, struct zorro_dev, dev) | 40 | #define to_zorro_dev(n) container_of(n, struct zorro_dev, dev) |
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | /* | ||
| 44 | * Zorro bus | ||
| 45 | */ | ||
| 46 | |||
| 47 | extern struct bus_type zorro_bus_type; | ||
| 48 | |||
| 49 | |||
| 50 | /* | 43 | /* |
| 51 | * Zorro device drivers | 44 | * Zorro device drivers |
| 52 | */ | 45 | */ |
| @@ -70,11 +63,6 @@ struct zorro_driver { · 17 unmodified lines | |||
| 70 | /* New-style probing */ | 63 | /* New-style probing */ |
| 71 | extern int zorro_register_driver(struct zorro_driver *); | 64 | extern int zorro_register_driver(struct zorro_driver *); |
| 72 | extern void zorro_unregister_driver(struct zorro_driver *); | 65 | extern void zorro_unregister_driver(struct zorro_driver *); |
| 73 | extern const struct zorro_device_id *zorro_match_device(const struct zorro_device_id *ids, const struct zorro_dev *z); | ||
| 74 | static inline struct zorro_driver *zorro_dev_driver(const struct zorro_dev *z) | ||
| 75 | { | ||
| 76 | return z->driver; | ||
| 77 | } | ||
| 78 | 66 | ||
| 79 | 67 | ||
| 80 | extern unsigned int zorro_num_autocon; /* # of autoconfig devices found */ | 68 | extern unsigned int zorro_num_autocon; /* # of autoconfig devices found */ |