diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-24 12:45:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-24 12:45:47 -0700 |
| commit | 83da00fbc0c57ce6f84455156a2e3cc057fe7344 (patch) | |
| tree | fac652b63aac0bfade55cd8113afe668f00c9cd8 /arch/sparc/include/asm/oplib_64.h | |
| parent | 96971e9aa9578322648b2de593fd4863f3d9fc39 (diff) | |
| parent | 06090e8ed89ea2113a236befb41f71d51f100e60 (diff) | |
| download | linux-83da00fbc0c57ce6f84455156a2e3cc057fe7344.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull two sparc fixes from David Miller:
1) Fix boots with gcc-4.9 compiled sparc64 kernels.
2) Add missing __get_user_pages_fast() on sparc64 to fix hangs on
futexes used in transparent hugepage areas.
It's really idiotic to have a weak symbolled fallback that just
returns zero, and causes this kind of bug. There should be no
backup implementation and the link should fail if the architecture
fails to provide __get_user_pages_fast() and supports transparent
hugepages.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Implement __get_user_pages_fast().
sparc64: Fix register corruption in top-most kernel stack frame during boot.
Diffstat (limited to 'arch/sparc/include/asm/oplib_64.h')
| -rw-r--r-- | arch/sparc/include/asm/oplib_64.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h index f34682430fcf..2e3a4add8591 100644 --- a/arch/sparc/include/asm/oplib_64.h +++ b/arch/sparc/include/asm/oplib_64.h @@ -62,7 +62,8 @@ struct linux_mem_p1275 { /* You must call prom_init() before using any of the library services, * preferably as early as possible. Pass it the romvec pointer. */ -void prom_init(void *cif_handler, void *cif_stack); +void prom_init(void *cif_handler); +void prom_init_report(void); /* Boot argument acquisition, returns the boot command line string. */ char *prom_getbootargs(void); |