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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
"Three minor fixes from David Howells and Paul Gortmaker"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2]
sparc32: make copy_to/from_user_page() usable from modular code
sparc32: fix build failure for arch_jump_label_transform

Linus Torvalds 34acae3c 795233bf

+3 -2
+1 -1
arch/sparc/Kconfig
··· 27 27 select RTC_DRV_M48T59 28 28 select HAVE_DMA_ATTRS 29 29 select HAVE_DMA_API_DEBUG 30 - select HAVE_ARCH_JUMP_LABEL 30 + select HAVE_ARCH_JUMP_LABEL if SPARC64 31 31 select GENERIC_IRQ_SHOW 32 32 select ARCH_WANT_IPC_PARSE_VERSION 33 33 select GENERIC_PCI_IOMAP
+2
arch/sparc/mm/srmmu.c
··· 14 14 #include <linux/pagemap.h> 15 15 #include <linux/vmalloc.h> 16 16 #include <linux/kdebug.h> 17 + #include <linux/export.h> 17 18 #include <linux/kernel.h> 18 19 #include <linux/init.h> 19 20 #include <linux/log2.h> ··· 63 62 static pgd_t *srmmu_swapper_pg_dir; 64 63 65 64 const struct sparc32_cachetlb_ops *sparc32_cachetlb_ops; 65 + EXPORT_SYMBOL(sparc32_cachetlb_ops); 66 66 67 67 #ifdef CONFIG_SMP 68 68 const struct sparc32_cachetlb_ops *local_ops;
-1
drivers/sbus/char/jsflash.c
··· 507 507 } 508 508 509 509 /* Let us be really paranoid for modifications to probing code. */ 510 - /* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */ 511 510 if (sparc_cpu_model != sun4m) { 512 511 /* We must be on sun4m because we use MMU Bypass ASI. */ 513 512 return -ENXIO;