diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-12 22:05:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-12 22:05:31 +0300 |
| commit | b57b17e88bf58860dad312d08db7d6708ee6d06d (patch) | |
| tree | 4ac9929a130cded36b50788c3d7bcfc2d4ec202d /drivers | |
| parent | 4eeee6636af819454d7c43702e77ec7857a63000 (diff) | |
| parent | a406b8b424fa01f244c1aab02ba186258448c36b (diff) | |
| download | linux-b57b17e88bf58860dad312d08db7d6708ee6d06d.tar.xz | |
Merge tag 'parisc-for-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc architecture fixes from Helge Deller:
- Include the upper 5 address bits when inserting TLB entries on a
64-bit kernel.
On physical machines those are ignored, but in qemu it's nice to have
them included and to be correct.
- Stop the 64-bit kernel and show a warning if someone tries to boot on
a machine with a 32-bit CPU
- Fix a "no previous prototype" warning in parport-gsc
* tag 'parisc-for-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Prevent booting 64-bit kernels on PA1.x machines
parport: gsc: mark init function static
parisc/pgtable: Do not drop upper 5 address bits of physical address
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parport/parport_gsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index 5e4475254bd0..c7e18382dc01 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c @@ -392,7 +392,7 @@ static struct parisc_driver parport_driver __refdata = { .remove = __exit_p(parport_remove_chip), }; -int parport_gsc_init(void) +static int parport_gsc_init(void) { return register_parisc_driver(&parport_driver); } |