Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34acae3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 795233bf 967f038e

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ config SPARC 
	select RTC_DRV_M48T59

	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL if SPARC64

	select GENERIC_IRQ_SHOW

	select ARCH_WANT_IPC_PARSE_VERSION

	select GENERIC_PCI_IOMAP

arch/sparc/mm/srmmu.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/pagemap.h>

#include <linux/vmalloc.h>

#include <linux/kdebug.h>

#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/log2.h>
@@ -62,6 +63,7 @@ extern unsigned long last_valid_pfn; 
static pgd_t *srmmu_swapper_pg_dir;



const struct sparc32_cachetlb_ops *sparc32_cachetlb_ops;

EXPORT_SYMBOL(sparc32_cachetlb_ops);



#ifdef CONFIG_SMP

const struct sparc32_cachetlb_ops *local_ops;

drivers/sbus/char/jsflash.c

+0 −1
Original line number Diff line number Diff line
@@ -507,7 +507,6 @@ static int jsflash_init(void) 
	}



	/* Let us be really paranoid for modifications to probing code. */

	/* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */

	if (sparc_cpu_model != sun4m) {

		/* We must be on sun4m because we use MMU Bypass ASI. */

		return -ENXIO;