#
380622e9 |
| 13-Jun-2012 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus
|
#
d3514abc |
| 04-Jun-2012 |
Len Brown <len.brown@intel.com> |
Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat', 'bugfix-video' and 'workaround-pss' into release
bug fixes
Signed-off-by: Len Brown <len.brown@intel.com>
|
#
7e1bd6e3 |
| 04-Jun-2012 |
Len Brown <len.brown@intel.com> |
Merge branch 'upstream' into bugfix-video
Update bugfix-video branch to 2.5-rc1 so I don't have to again resolve the conflict in these patches vs. upstream.
Conflicts: drivers/gpu/drm/gma500/psb_d
Merge branch 'upstream' into bugfix-video
Update bugfix-video branch to 2.5-rc1 so I don't have to again resolve the conflict in these patches vs. upstream.
Conflicts: drivers/gpu/drm/gma500/psb_drv.c
text conflict: add comment vs delete neighboring line
keep just this: /* igd_opregion_init(&dev_priv->opregion_dev); */ /* acpi_video_register(); */
Signed-off-by: Len Brown <len.brown@intel.com>
show more ...
|
#
bbd77147 |
| 30-May-2012 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
#
063e0477 |
| 30-May-2012 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into perf/urgent
Merge back Linus's latest branch so that we pick up the uprobes changes.
( I tested this branch locally and while it's one from the middle of the merge windo
Merge branch 'linus' into perf/urgent
Merge back Linus's latest branch so that we pick up the uprobes changes.
( I tested this branch locally and while it's one from the middle of the merge window it's a good one to base further work off. )
Signed-off-by: Ingo Molnar <mingo@kernel.org>
show more ...
|
#
731a7378 |
| 30-May-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 trampoline rework from H. Peter Anvin: "This code reworks all the "trampoline"/"realmode" c
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 trampoline rework from H. Peter Anvin: "This code reworks all the "trampoline"/"realmode" code (various bits that need to live in the first megabyte of memory, most but not all of which runs in real mode at some point) in the kernel into a single object. The main reason for doing this is that it eliminates the last place in the kernel where we needed pages to be mapped RWX. This code separates all that code into proper R/RW/RX pages."
Fix up conflicts in arch/x86/kernel/Makefile (mca removed next to reboot code), and arch/x86/kernel/reboot.c (reboot code moved around in one branch, modified in this one), and arch/x86/tools/relocs.c (mostly same code came in earlier due to working around the ld bugs just before the 3.4 release).
Also remove stale x86-relocs entry from scripts/.gitignore as per Peter Anvin.
* commit '61f5446169046c217a5479517edac3a890c3bee7': (36 commits) x86, realmode: Move end signature into header.S x86, relocs: When printing an error, say relative or absolute x86, relocs: More relocations which may end up as absolute x86, relocs: Workaround for binutils 2.22.52.0.1 section bug xen-acpi-processor: Add missing #include <xen/xen.h> acpi, bgrd: Add missing <linux/io.h> to drivers/acpi/bgrt.c x86, realmode: Change EFER to a single u64 field x86, realmode: Move kernel/realmode.c to realmode/init.c x86, realmode: Move not-common bits out of trampoline_common.S x86, realmode: Mask out EFER.LMA when saving trampoline EFER x86, realmode: Fix no cache bits test in reboot_32.S x86, realmode: Make sure all generated files are listed in targets x86, realmode: build fix: remove duplicate build x86, realmode: read cr4 and EFER from kernel for 64-bit trampoline x86, realmode: fixes compilation issue in tboot.c x86, realmode: move relocs from scripts/ to arch/x86/tools x86, realmode: header for trampoline code x86, realmode: flattened rm hierachy x86, realmode: don't copy real_mode_header x86, realmode: fix 64-bit wakeup sequence ...
show more ...
|
Revision tags: v3.4 |
|
#
13712701 |
| 16-May-2012 |
H. Peter Anvin <hpa@linux.intel.com> |
x86, realmode: Move kernel/realmode.c to realmode/init.c
Keep all the realmode code together, including initialization (only the rm/ subdirectory is actually built as real-mode code, anyway.)
Signe
x86, realmode: Move kernel/realmode.c to realmode/init.c
Keep all the realmode code together, including initialization (only the rm/ subdirectory is actually built as real-mode code, anyway.)
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
show more ...
|
Revision tags: v3.4-rc7 |
|
#
c5403aed |
| 09-May-2012 |
Jarkko Sakkinen <jarkko.sakkinen@intel.com> |
x86, realmode: build fix: remove duplicate build
Real-mode binary was built twice. This patch fixes the issue by making realmode.relocs as target for realmode.bin.
[ hpa: removed the direct depende
x86, realmode: build fix: remove duplicate build
Real-mode binary was built twice. This patch fixes the issue by making realmode.relocs as target for realmode.bin.
[ hpa: removed the direct dependency on realmode.relocs in arch/x86/realmode/Makefile ]
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com> Link: http://lkml.kernel.org/r/1336595106-21135-1-git-send-email-jarkko.sakkinen@intel.com Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
show more ...
|
#
b3266bd6 |
| 08-May-2012 |
Jarkko Sakkinen <jarkko.sakkinen@intel.com> |
x86, realmode: realmode.bin infrastructure
Create realmode.bin and realmode.relocs files. Piggy pack them into relocatable object that will be included into .init.data section of the main kernel ima
x86, realmode: realmode.bin infrastructure
Create realmode.bin and realmode.relocs files. Piggy pack them into relocatable object that will be included into .init.data section of the main kernel image.
The first file includes binary image of the real-mode code. The latter file includes all relocations. The layout of the binary image is specified in realmode.lds.S. The makefile generates pa_ prefixed symbols for each exported global. These are used in 32-bit code and in realmode header to define symbols that need to be relocated.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com> Link: http://lkml.kernel.org/r/1336501366-28617-3-git-send-email-jarkko.sakkinen@intel.com Originally-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
show more ...
|