Subject: + asm-systemh-sparc-sparc_cpu_model-isnt-in-asm-systemh-any-more.patch added to -mm tree To: dhowells@xxxxxxxxxx,arnd@xxxxxxxx,davem@xxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 12 Feb 2014 12:59:46 -0800 The patch titled Subject: asm/system.h: sparc: sparc_cpu_model isn't in asm/system.h any more has been added to the -mm tree. Its filename is asm-systemh-sparc-sparc_cpu_model-isnt-in-asm-systemh-any-more.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/asm-systemh-sparc-sparc_cpu_model-isnt-in-asm-systemh-any-more.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/asm-systemh-sparc-sparc_cpu_model-isnt-in-asm-systemh-any-more.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: David Howells <dhowells@xxxxxxxxxx> Subject: asm/system.h: sparc: sparc_cpu_model isn't in asm/system.h any more sparc_cpu_model isn't in asm/system.h any more, so remove a comment about it. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/sbus/char/jsflash.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN drivers/sbus/char/jsflash.c~asm-systemh-sparc-sparc_cpu_model-isnt-in-asm-systemh-any-more drivers/sbus/char/jsflash.c --- a/drivers/sbus/char/jsflash.c~asm-systemh-sparc-sparc_cpu_model-isnt-in-asm-systemh-any-more +++ a/drivers/sbus/char/jsflash.c @@ -507,11 +507,9 @@ 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) { + if (sparc_cpu_model != sun4m) /* We must be on sun4m because we use MMU Bypass ASI. */ return -ENXIO; - } if (jsf0.base == 0) { jsf = &jsf0; _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are origin.patch fs-cachefiles-use-add_to_page_cache_lru.patch asm-systemh-clean-asm-systemh-from-docs.patch asm-systemh-sparc-sparc_cpu_model-isnt-in-asm-systemh-any-more.patch asm-systemh-um-arch_align_stack-moved-to-asm-exech.patch asm-systemh-arm-delete-asm-systemh.patch linux-next.patch mutex-subsystem-synchro-test-module.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html