3.1-rc2-git5 snapshot
Make XHCI builtin, add a patch to fix a race in the crypto framework
This commit is contained in:
Josh Boyer
parent
3774ce3c1d
commit
1c2cec9cfb
|
|
@ -3126,7 +3126,7 @@ CONFIG_USB_SL811_HCD=m
|
|||
CONFIG_USB_SL811_HCD_ISO=y
|
||||
# CONFIG_USB_SL811_CS is not set
|
||||
# CONFIG_USB_R8A66597_HCD is not set
|
||||
CONFIG_USB_XHCI_HCD=m
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
|
||||
CONFIG_USB_ISP1362_HCD=m
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ CONFIG_EFI=y
|
|||
# CONFIG_ITANIUM is not set
|
||||
CONFIG_MCKINLEY=y
|
||||
CONFIG_IA64_GENERIC=y
|
||||
CONFIG_DMAR=y
|
||||
# CONFIG_IA64_DIG is not set
|
||||
# CONFIG_IA64_HP_ZX1 is not set
|
||||
# CONFIG_IA64_SGI_SN2 is not set
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
commit 9d4c522a113f6caa8b792ae829a25490fa87b1a2
|
||||
Author: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
Date: Fri Aug 19 16:11:23 2011 +0800
|
||||
|
||||
crypto: cryptd - Use subsys_initcall to prevent races with aesni
|
||||
|
||||
As cryptd is depeneded on by other algorithms such as aesni-intel,
|
||||
it needs to be registered before them. When everything is built
|
||||
as modules, this occurs naturally. However, for this to work when
|
||||
they are built-in, we need to use subsys_initcall in cryptd.
|
||||
|
||||
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
|
||||
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
|
||||
index e46d21a..671d4d6 100644
|
||||
--- a/crypto/cryptd.c
|
||||
+++ b/crypto/cryptd.c
|
||||
@@ -945,7 +945,7 @@ static void __exit cryptd_exit(void)
|
||||
crypto_unregister_template(&cryptd_tmpl);
|
||||
}
|
||||
|
||||
-module_init(cryptd_init);
|
||||
+subsys_initcall(cryptd_init);
|
||||
module_exit(cryptd_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
12
kernel.spec
12
kernel.spec
|
|
@ -51,7 +51,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 1
|
||||
%global baserelease 0
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -84,7 +84,7 @@ Summary: The Linux kernel
|
|||
# The rc snapshot level
|
||||
%define rcrev 2
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
%define gitrev 5
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -718,6 +718,7 @@ Patch12024: epoll-fix-spurious-lockdep-warnings.patch
|
|||
Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
|
||||
Patch12026: block-stray-block-put-after-teardown.patch
|
||||
Patch12027: usb-add-quirk-for-logitech-webcams.patch
|
||||
Patch12029: crypto-register-cryptd-first.patch
|
||||
|
||||
# Runtime power management
|
||||
Patch12203: linux-2.6-usb-pci-autosuspend.patch
|
||||
|
|
@ -1343,6 +1344,8 @@ ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
|
|||
ApplyPatch block-stray-block-put-after-teardown.patch
|
||||
ApplyPatch usb-add-quirk-for-logitech-webcams.patch
|
||||
|
||||
ApplyPatch crypto-register-cryptd-first.patch
|
||||
|
||||
# Runtime PM
|
||||
#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
|
||||
### Broken by implicit notify support & ACPICA rebase
|
||||
|
|
@ -2058,6 +2061,11 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Fri Aug 19 2011 Josh Boyer <jwboyer@redhat.com>
|
||||
- Linux 3.1-rc2-git5
|
||||
- Change XHCI to builtin (rhbz 731706)
|
||||
- Add patch to fix race between cryptd and aesni (rhbz 721002)
|
||||
|
||||
* Thu Aug 18 2011 Josh Boyer <jwboyer@redhat.com>
|
||||
- Adjust provides/obsoletes to replace the cpupowerutils package
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue