diff options
| author | Linus Torvalds | 2013-12-04 08:54:36 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2013-12-04 08:54:36 -0800 |
| commit | 8aa9c36788ee5ebf7a1377742d577911bfc9cfe7 (patch) | |
| tree | 273361c41f33968e89f88efa2c4cd38ebff6fd7a /arch/um | |
| parent | 278717909d47d86fbb20ab66dfeaa84560a2f8f2 (diff) | |
| parent | a16ab68ee96005382738c706fd06bdd874d9185b (diff) | |
Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parsic updates from Helge Deller:
- a fix for the mmap(MAP_FIXED|MAP_SHARED) syscall to the same address
which was already given in a previous call (fixes locale-gen on
debian)
- change the memory layout of the kernel to avoid the need for the
-mlong-calls compiler option (depends on commit 5ecbe3c3c690 -
"kernel/extable: fix address-checks for core_kernel and init areas")
- defconfig updates, e.g. use the SIL680 driver instead of the SIIMAGE
driver
- add more parisc machine names to the machine database
* 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver
parisc: remove CONFIG_MLONGCALLS=y from defconfigs
parisc: fix kernel memory layout in vmlinux.ld.S
parisc: use kernel_text_address() in unwind functions
parisc: remove empty SERIAL_PORT_DFNS in serial.h
parisc: add some more machine names to hardware database
parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions