Merge branch 'master' into rawhide/user/myoung/xendom0
This commit is contained in:
commit
caa69bbc91
10
kernel.spec
10
kernel.spec
|
@ -52,7 +52,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be prepended with "0.", so
|
||||
# for example a 3 here will become 0.3
|
||||
#
|
||||
%global baserelease 3
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -85,7 +85,7 @@ Summary: The Linux kernel
|
|||
# The rc snapshot level
|
||||
%define rcrev 2
|
||||
# The git snapshot level
|
||||
%define gitrev 1
|
||||
%define gitrev 3
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 2.6.%{upstream_sublevel}
|
||||
%endif
|
||||
|
@ -1133,6 +1133,7 @@ cp %{SOURCE15} .
|
|||
# Dynamically generate kernel .config files from config-* files
|
||||
make -f %{SOURCE20} VERSION=%{version} configs
|
||||
|
||||
%if %{?all_arch_configs:1}%{!?all_arch_configs:0}
|
||||
#if a rhel kernel, apply the rhel config options
|
||||
%if 0%{?rhel}
|
||||
for i in %{all_arch_configs}
|
||||
|
@ -1150,6 +1151,7 @@ do
|
|||
./merge.pl %{SOURCE1000} $i.tmp > $i
|
||||
rm $i.tmp
|
||||
done
|
||||
%endif
|
||||
|
||||
ApplyOptionalPatch git-linus.diff
|
||||
|
||||
|
@ -1972,6 +1974,10 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Tue Jan 25 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git3.1
|
||||
- Linux 2.6.38-rc2-git3
|
||||
- perf-gcc460-build-fixes.patch: fix context from [9486aa38]
|
||||
|
||||
* Mon Jan 24 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git1.3
|
||||
- Disable usb/pci/acpi autosuspend goo until it can be checked.
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ index 05344c6..373cfc0 100644
|
|||
- len = sym->end - sym->start;
|
||||
-
|
||||
sprintf(command,
|
||||
"objdump --start-address=%#0*Lx --stop-address=%#0*Lx -dS %s",
|
||||
"objdump --start-address=%#0*" PRIx64 " --stop-address=%#0*" PRIx64 " -dS %s",
|
||||
BITS_PER_LONG / 4, map__rip_2objdump(map, sym->start),
|
||||
@@ -1295,7 +1292,7 @@ static int __cmd_top(void)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue