tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'parisc-for-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture fixes from Helge Deller:
"Some small parisc architecture fixes for 6.0-rc6:

One patch lightens up a previous commit and thus unbreaks building the
debian kernel, which tries to configure a 64-bit kernel with the
ARCH=parisc environment variable set.

The other patches fixes asm/errno.h includes in the tools directory
and cleans up memory allocation in the iosapic driver.

Summary:

- Allow configuring 64-bit kernel with ARCH=parisc

- Fix asm/errno.h includes in tools directory for parisc and xtensa

- Clean up iosapic memory allocation

- Minor typo and spelling fixes"

* tag 'parisc-for-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Allow CONFIG_64BIT with ARCH=parisc
parisc: remove obsolete manual allocation aligning in iosapic
tools/include/uapi: Fix <asm/errno.h> for parisc and xtensa
Input: hp_sdc: fix spelling typo in comment
parisc: ccio-dma: Add missing iounmap in error path in ccio_probe()

Linus Torvalds 7c18b453 38eddeed

+16 -14
+11 -1
arch/parisc/Kconfig
··· 224 224 Enabling this option will probably slow down your kernel. 225 225 226 226 config 64BIT 227 - def_bool "$(ARCH)" = "parisc64" 227 + def_bool y if "$(ARCH)" = "parisc64" 228 + bool "64-bit kernel" if "$(ARCH)" = "parisc" 228 229 depends on PA8X00 230 + help 231 + Enable this if you want to support 64bit kernel on PA-RISC platform. 232 + 233 + At the moment, only people willing to use more than 2GB of RAM, 234 + or having a 64bit-only capable PA-RISC machine should say Y here. 235 + 236 + Since there is no 64bit userland on PA-RISC, there is no point to 237 + enable this option otherwise. The 64bit kernel is significantly bigger 238 + and slower than the 32bit one. 229 239 230 240 choice 231 241 prompt "Kernel page size"
+1
drivers/parisc/ccio-dma.c
··· 1546 1546 } 1547 1547 ccio_ioc_init(ioc); 1548 1548 if (ccio_init_resources(ioc)) { 1549 + iounmap(ioc->ioc_regs); 1549 1550 kfree(ioc); 1550 1551 return -ENOMEM; 1551 1552 }
+1 -10
drivers/parisc/iosapic.c
··· 221 221 222 222 static struct irt_entry *iosapic_alloc_irt(int num_entries) 223 223 { 224 - unsigned long a; 225 - 226 - /* The IRT needs to be 8-byte aligned for the PDC call. 227 - * Normally kmalloc would guarantee larger alignment, but 228 - * if CONFIG_DEBUG_SLAB is enabled, then we can get only 229 - * 4-byte alignment on 32-bit kernels 230 - */ 231 - a = (unsigned long)kmalloc(sizeof(struct irt_entry) * num_entries + 8, GFP_KERNEL); 232 - a = (a + 7UL) & ~7UL; 233 - return (struct irt_entry *)a; 224 + return kcalloc(num_entries, sizeof(struct irt_entry), GFP_KERNEL); 234 225 } 235 226 236 227 /**
+1 -1
include/linux/hp_sdc.h
··· 180 180 181 181 #define HP_SDC_CMD_SET_IM 0x40 /* 010xxxxx == set irq mask */ 182 182 183 - /* The documents provided do not explicitly state that all registers betweem 183 + /* The documents provided do not explicitly state that all registers between 184 184 * 0x01 and 0x1f inclusive can be read by sending their register index as a 185 185 * command, but this is implied and appears to be the case. 186 186 */
+2 -2
tools/include/uapi/asm/errno.h
··· 9 9 #include "../../../arch/alpha/include/uapi/asm/errno.h" 10 10 #elif defined(__mips__) 11 11 #include "../../../arch/mips/include/uapi/asm/errno.h" 12 - #elif defined(__xtensa__) 13 - #include "../../../arch/xtensa/include/uapi/asm/errno.h" 12 + #elif defined(__hppa__) 13 + #include "../../../arch/parisc/include/uapi/asm/errno.h" 14 14 #else 15 15 #include <asm-generic/errno.h> 16 16 #endif