[kernel] Rebase to Linux 3.3-rc1
Josh Boyer
jwboyer at fedoraproject.org
Fri Jan 20 18:35:39 UTC 2012
commit e8409b1dce1d927283cb4999d9902b8cda4f86fc
Author: Josh Boyer <jwboyer at redhat.com>
Date: Fri Jan 20 13:32:57 2012 -0500
Rebase to Linux 3.3-rc1
The utrace patch is left unapplied as it doesn't apply cleanly any longer
...ooth-Add-support-for-BCM20702A0-0a5c-21e3.patch | 42 -
PatchList.txt | 8 -
...s-in-a-batch-should-not-be-accounted-as-a.patch | 68 -
alps.patch | 1861 --------------------
bcma-brcmsmac-compat.patch | 13 +-
...s-rtl8192cu-Fix-WARNING-on-suspend-resume.patch | 131 --
config-arm-generic | 1 +
config-arm-imx | 6 +
config-arm-kirkwood | 4 +
config-arm-omap-generic | 16 +
config-arm-tegra | 12 +
config-generic | 61 +-
config-powerpc-generic | 8 +
config-powerpc64 | 4 +
config-sparc64-generic | 1 +
config-x86-32-generic | 4 +
config-x86-generic | 13 +
config-x86_64-generic | 3 +
epoll-limit-paths.patch | 465 -----
...error-handling-on-inode-bitmap-corruption.patch | 19 -
kernel.spec | 98 +-
kmemleak.patch | 100 ++
linux-2.6-defaults-acpi-video.patch | 10 +-
...rx-key-NULL-ptr-deref-in-promiscuous-mode.patch | 47 -
nfs-client-freezer.patch | 197 ---
nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch | 118 --
pci-Rework-ASPM-disable-code.patch | 287 ---
proc-clean-up-and-fix-proc-pid-mem-handling.patch | 268 ---
...null-pointer-deref-in-proc_pid_permission.patch | 44 -
procfs-add-hidepid-and-gid-mount-options.patch | 342 ----
procfs-parse-mount-options.patch | 173 --
revert-efi-rtclock.patch | 17 +-
rtl8192cu-Fix-WARNING-on-suspend-resume.patch | 163 --
sources | 2 +-
sysfs-msi-irq-per-device.patch | 239 ---
35 files changed, 269 insertions(+), 4576 deletions(-)
---
diff --git a/PatchList.txt b/PatchList.txt
index 7bf8ba3..a850c48 100644
--- a/PatchList.txt
+++ b/PatchList.txt
@@ -7,15 +7,7 @@
**** Queued for 3.3 ***********************************************************************************
drm-edid-try-harder-to-fix-up-broken-headers.patch
-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
ext4-Support-check-none-nocheck-mount-options.patch
-ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
-proc-clean-up-and-fix-proc-pid-mem-handling.patch
-proc-fix-null-pointer-deref-in-proc_pid_permission.patch
-procfs-add-hidepid-and-gid-mount-options.patch
-procfs-parse-mount-options.patch
-epoll-limit-paths.patch
-Unused-iocbs-in-a-batch-should-not-be-accounted-as-a.patch
**** Other stuff that should go upstream (in decreasing likelyhood) ************************************
diff --git a/bcma-brcmsmac-compat.patch b/bcma-brcmsmac-compat.patch
index e16e5b0..aaa7a61 100644
--- a/bcma-brcmsmac-compat.patch
+++ b/bcma-brcmsmac-compat.patch
@@ -22,14 +22,15 @@ diff -up linux-3.1.x86_64/drivers/bcma/host_pci.c.orig linux-3.1.x86_64/drivers/
{ 0, },
};
MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
-diff -up linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig
---- linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig 2011-11-10 11:42:31.764930961 -0500
-+++ linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig 2011-11-10 11:42:33.613907846 -0500
-@@ -5,7 +5,6 @@ config BRCMSMAC
+diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
+index cd6375d..caa0302 100644
+--- a/drivers/net/wireless/brcm80211/Kconfig
++++ b/drivers/net/wireless/brcm80211/Kconfig
+@@ -4,7 +4,6 @@ config BRCMUTIL
+ config BRCMSMAC
tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
- depends on PCI
depends on MAC80211
-- depends on BCMA=n
+- depends on BCMA
select BRCMUTIL
select FW_LOADER
select CRC_CCITT
diff --git a/config-arm-generic b/config-arm-generic
index f201705..abd9f3c 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -200,3 +200,4 @@ CONFIG_ARM_ERRATA_751472=y
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_CS89x0 is not set
+# CONFIG_OF_SELFTEST is not set
diff --git a/config-arm-imx b/config-arm-imx
index 2dbe10a..5bb9633 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -96,3 +96,9 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_PL310_ERRATA_769419=y
CONFIG_LEDS_RENESAS_TPU=y
+
+# CONFIG_ARM_LPAE is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index 44e41f5..a814383 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -40,3 +40,7 @@ CONFIG_RTC_DRV_MV=m
CONFIG_MV_XOR=y
CONFIG_CRYPTO_DEV_MV_CESA=m
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index d623e18..9e15f63 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -1083,3 +1083,19 @@ CONFIG_LEDS_RENESAS_TPU=y
# CONFIG_OMAP_IOMMU is not set
CONFIG_USB_RENESAS_USBHS_HCD=m
+# CONFIG_ARM_LPAE is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_SOC_OMAPTI81XX is not set
+# CONFIG_SOC_OMAPAM33XX is not set
+# CONFIG_MACH_TI8148EVM is not set
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_VIDEO_AS3645A is not set
+#
+
diff --git a/config-arm-tegra b/config-arm-tegra
index 495e91e..4c537ef 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -90,3 +90,15 @@ CONFIG_ARM_CPU_TOPOLOGY=y
CONFIG_SCHED_MC=y
CONFIG_SCHED_SMT=y
CONFIG_LEDS_RENESAS_TPU=y
+
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+# CONFIG_ETHERNET is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_DVB_TDA1004X is not set
+# CONFIG_DVB_PLL is not set
+# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
+
diff --git a/config-generic b/config-generic
index a21ae95..9330766 100644
--- a/config-generic
+++ b/config-generic
@@ -149,6 +149,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
CONFIG_INFINIBAND_IPOIB_CM=y
CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USER_ACCESS=m
CONFIG_INFINIBAND_IPATH=m
@@ -248,6 +249,7 @@ CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
@@ -648,12 +650,14 @@ CONFIG_TCP_MD5SIG=y
#
CONFIG_PACKET=y
CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
CONFIG_NET_KEY=m
CONFIG_NET_KEY_MIGRATE=y
CONFIG_INET=y
CONFIG_INET_LRO=y
CONFIG_INET_TUNNEL=m
CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_FIB_TRIE_STATS=y
@@ -702,6 +706,12 @@ CONFIG_IP_VS_DH=m
CONFIG_IP_VS_SH=m
CONFIG_IP_VS_SED=m
CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
CONFIG_IP_VS_FTP=m
CONFIG_IP_VS_PE_SIP=m
@@ -744,6 +754,7 @@ CONFIG_NETFILTER=y
CONFIG_NETFILTER_ADVANCED=y
CONFIG_NF_CONNTRACK=m
CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NETFILTER_TPROXY=m
@@ -784,6 +795,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
CONFIG_NETFILTER_XT_MATCH_DCCP=m
CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
CONFIG_NETFILTER_XT_MATCH_ESP=m
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -795,6 +807,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
@@ -824,6 +837,7 @@ CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y # check if contrack(8) in f17 supports netlink
# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m
@@ -847,6 +861,7 @@ CONFIG_NF_CT_PROTO_UDPLITE=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -879,6 +894,7 @@ CONFIG_IP6_NF_MATCH_FRAG=m
CONFIG_IP6_NF_MATCH_HL=m
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
CONFIG_IP6_NF_MATCH_OPTS=m
CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_QUEUE=m
@@ -1040,6 +1056,9 @@ CONFIG_NET_ACT_SIMP=m
CONFIG_NET_ACT_SKBEDIT=m
CONFIG_DCB=y
+# CONFIG_OPENVSWITCH is not set
+CONFIG_NETPRIO_CGROUP=m
+
#
# Network testing
@@ -1056,6 +1075,9 @@ CONFIG_NETDEVICES=y
#
# CONFIG_ARCNET is not set
CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_MACVLAN=m
@@ -1143,6 +1165,7 @@ CONFIG_ATL1E=m
CONFIG_NET_VENDOR_BROCADE=y
CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
CONFIG_NET_VENDOR_CHELSIO=y
CONFIG_CHELSIO_T1=m
@@ -1275,6 +1298,8 @@ CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_DA is not set
# CONFIG_STMMAC_DUAL_MAC is not set
# CONFIG_STMMAC_TIMER is not set
@@ -1424,6 +1449,7 @@ CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUG is not set
CONFIG_ATH9K_DEBUGFS=y
CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_ATH9K_RATE_CONTROL=y
CONFIG_CARL9170=m
@@ -1452,6 +1478,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
# CONFIG_B43LEGACY_PIO_MODE is not set
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMDBG is not set
CONFIG_HERMES=m
CONFIG_HERMES_CACHE_FW_ON_INIT=y
@@ -1485,11 +1512,10 @@ CONFIG_IWLWIFI=m
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-# CONFIG_IWL_P2P is not set
-CONFIG_IWLAGN=m
-CONFIG_IWLWIFI_LEGACY=m
-CONFIG_IWLWIFI_LEGACY_DEBUG=y
-CONFIG_IWLWIFI_LEGACY_DEBUGFS=y
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWLEGACY_DEBUG=y
+CONFIG_IWLEGACY_DEBUGFS=y
# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
CONFIG_IWL4965=y
CONFIG_IWL3945=m
@@ -1869,8 +1895,10 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_MCS is not set
# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -1919,6 +1947,7 @@ CONFIG_TOUCHSCREEN_AD7879_I2C=m
# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
CONFIG_TOUCHSCREEN_DYNAPRO=m
CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GUNZE=m
@@ -1934,6 +1963,7 @@ CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
CONFIG_TOUCHSCREEN_USB_E2I=y
@@ -2421,6 +2451,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
#
CONFIG_V4L_USB_DRIVERS=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
+CONFIG_V4L_PCI_DRIVERS=y
CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_BT848=m
CONFIG_VIDEO_BT848_DVB=y
@@ -2471,6 +2502,8 @@ CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
CONFIG_VIDEO_ZORAN_ZR36060=m
+# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
CONFIG_VIDEO_FB_IVTV=m
CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_TM6000=m
@@ -2498,6 +2531,7 @@ CONFIG_MEDIA_TUNER_TEA5761=m
CONFIG_MEDIA_TUNER_TEA5767=m
CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
@@ -2621,6 +2655,7 @@ CONFIG_DVB_DDBRIDGE=m
CONFIG_DVB_MB86A20S=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_DIB9000=m
+CONFIG_DVB_HD29L2=m
CONFIG_DVB_STV0367=m
#
@@ -2696,6 +2731,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_JVC_DECODER=m
CONFIG_IR_SONY_DECODER=m
CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_IMON=m
@@ -2996,6 +3032,7 @@ CONFIG_USB_SUSPEND=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EHCI_MV is not set
CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_HCD_SSB is not set
CONFIG_USB_UHCI_HCD=y
@@ -3101,11 +3138,13 @@ CONFIG_HID_ACRUX_FF=y
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_LCPOWER=m
CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_ISKU=m
CONFIG_HID_ROCCAT_KOVAPLUS=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
CONFIG_HID_SPEEDLINK=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
#
# USB Imaging devices
@@ -3157,6 +3196,7 @@ CONFIG_USB_GSPCA_PAC7302=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GL860=m
CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
CONFIG_USB_GSPCA_KONICA=m
CONFIG_USB_GSPCA_XIRLINK_CIT=m
CONFIG_USB_GSPCA_SPCA1528=m
@@ -3547,6 +3587,8 @@ CONFIG_NFSD=m
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
+# Maybe see if we want this on for debug kernels?
+# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_NEW_IDMAPPER=y
@@ -3593,6 +3635,8 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
+# Maybe see if we want this on for debug kernels?
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
CONFIG_CONFIGFS_FS=y
@@ -3764,6 +3808,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
# CONFIG_SECURITY_APPARMOR is not set
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
#
# Cryptographic options
@@ -3902,6 +3947,7 @@ CONFIG_CGROUP_SCHED=y
CONFIG_CGROUP_MEM_RES_CTLR=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount'
# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
CONFIG_CGROUP_PERF=y
CONFIG_BLK_CGROUP=y
@@ -3986,6 +4032,7 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_S3C24XX is not set
CONFIG_LEDS_DELL_NETBOOKS=m
+# CONFIG_LEDS_TCA6507 is not set
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_IDE_DISK=y
@@ -4059,6 +4106,7 @@ CONFIG_APM_POWER=m
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
# CONFIG_BATTERY_BQ20Z75 is not set
# CONFIG_BATTERY_DS2780 is not set
# CONFIG_BATTERY_BQ27x00 is not set
@@ -4067,6 +4115,7 @@ CONFIG_APM_POWER=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_PCF50633 is not set
@@ -4169,6 +4218,8 @@ CONFIG_UWB_WHCI=m
CONFIG_UWB_I1480U=m
CONFIG_STAGING=y
+# CONFIG_RTLLIB is not set
+# CONFIG_ANDROID is not set
# CONFIG_STAGING_MEDIA is not set
# CONFIG_ET131X is not set
# CONFIG_SLICOSS is not set
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 2b35251..a05befa 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -352,3 +352,11 @@ CONFIG_RFKILL_GPIO=m
# Disable btrfs until it is shown to work with 64k pages (rhbz 747079)
# CONFIG_BTRFS_FS is not set
+#
+# CONFIG_CPU_IDLE is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+CONFIG_STRICT_DEVMEM=y
+
diff --git a/config-powerpc64 b/config-powerpc64
index 42b5016..39f9792 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -158,3 +158,7 @@ CONFIG_IO_EVENT_IRQ=y
CONFIG_HW_RANDOM_AMD=m
CONFIG_BPF_JIT=y
+# CONFIG_PPC_ICSWX_PID is not set
+# CONFIG_PPC_ICSWX_USE_SIGILL is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+
diff --git a/config-sparc64-generic b/config-sparc64-generic
index e9b66f6..2b29f9b 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -195,3 +195,4 @@ CONFIG_CRYPTO_DEV_NIAGARA2=y
# CONFIG_MTD_OF_PARTS is not set
# CONFIG_MTD_PHYSMAP_OF is not set
# CONFIG_MMC_SDHCI_OF is not set
+# CONFIG_OF_SELFTEST is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 6a9dc41..3fd696c 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -201,3 +201,7 @@ CONFIG_I2O_BUS=m
# CONFIG_EDAC_SBRIDGE is not set
# CONFIG_X86_WANT_INTEL_MID is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
diff --git a/config-x86-generic b/config-x86-generic
index 3b10fb8..e920346 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -34,6 +34,7 @@ CONFIG_X86_PAT=y
CONFIG_X86_PM_TIMER=y
CONFIG_EFI=y
+# CONFIG_EFI_STUB is not set
CONFIG_EFI_VARS=y
CONFIG_EFI_PCDP=y
CONFIG_FB_EFI=y
@@ -113,6 +114,7 @@ CONFIG_PM_STD_PARTITION=""
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_BIOS=y
+CONFIG_PCI_IOAPIC=y
CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -216,6 +218,7 @@ CONFIG_XO15_EBOOK=m
# CONFIG_SMSC37B787_WDT is not set
CONFIG_W83697HF_WDT=m
+CONFIG_VIA_WDT=m
CONFIG_CRASH_DUMP=y
CONFIG_PROC_VMCORE=y
@@ -375,6 +378,7 @@ CONFIG_PCH_PHUB=m
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_HP_ACCEL=m
@@ -389,3 +393,12 @@ CONFIG_RELOCATABLE=y
# CONFIG_HYPERV is not set
+# Depends on HOTPLUG_PCI_PCIE
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+
+# Figure out how this relates to DRM_PSB in staging because confused
+# CONFIG_DRM_GMA500 is not set
+
+# Maybe enable in debug kernels?
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 344a393..945ad0c 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -11,6 +11,7 @@ CONFIG_K8_NUMA=y
CONFIG_AMD_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y
# CONFIG_NUMA_EMU is not set
+# CONFIG_X86_NUMACHIP is not set
CONFIG_NR_CPUS=64
CONFIG_PHYSICAL_START=0x1000000
@@ -20,6 +21,7 @@ CONFIG_IA32_EMULATION=y
CONFIG_AMD_IOMMU=y
CONFIG_AMD_IOMMU_STATS=y
+CONFIG_AMD_IOMMU_V2=m
# CONFIG_IOMMU_DEBUG is not set
CONFIG_SWIOTLB=y
# CONFIG_CALGARY_IOMMU is not set
@@ -35,6 +37,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_HOTPLUG_PCI_SHPC=m
CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
diff --git a/kernel.spec b/kernel.spec
index c5bbdef..d59cc2c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 1
+%global released_kernel 0
# Save original buildid for later if it's defined
%if 0%{?buildid:1}
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 8
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -66,7 +66,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 0
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -85,9 +85,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 7
+%define rcrev 1
# The git snapshot level
-%define gitrev 5
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -218,7 +218,7 @@ Summary: The Linux kernel
#
# (Uncomment the '#' and both spaces below to disable with_backports.)
#
-# % define with_backports 0
+%define with_backports 0
#######################################################################
%define make_target bzImage
@@ -719,8 +719,7 @@ Patch1101: linux-3.1-keys-remove-special-keyring.patch
# patches headed upstream
Patch12016: disable-i8042-check-on-apple-mac.patch
-Patch12026: block-stray-block-put-after-teardown.patch
-Patch12030: epoll-limit-paths.patch
+#atch12026: block-stray-block-put-after-teardown.patch
Patch12303: dmar-disable-when-ricoh-multifunction.patch
@@ -733,53 +732,20 @@ Patch20000: utrace.patch
Patch21000: arm-omap-dt-compat.patch
Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
-#rhbz 753236
-Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
-
-#rhbz 590880
-Patch21030: alps.patch
-
-#rhbz 717735
-Patch21045: nfs-client-freezer.patch
-
-#rhbz 770233
-Patch21065: Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
-
Patch21070: ext4-Support-check-none-nocheck-mount-options.patch
-Patch21071: ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
-
-#rhbz 769766
-Patch21072: mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch
#rhbz 773392
Patch21073: KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
Patch21074: KVM-x86-fix-missing-checks-in-syscall-emulation.patch
-#rhbz 728740
-Patch21076: rtl8192cu-Fix-WARNING-on-suspend-resume.patch
-
-Patch21080: sysfs-msi-irq-per-device.patch
-
-#rhbz 782686
-Patch21082: procfs-parse-mount-options.patch
-Patch21083: procfs-add-hidepid-and-gid-mount-options.patch
-Patch21084: proc-fix-null-pointer-deref-in-proc_pid_permission.patch
-
-#rhbz 782681
-Patch21085: proc-clean-up-and-fix-proc-pid-mem-handling.patch
-
-#rhbz 782696
-Patch21086: Unused-iocbs-in-a-batch-should-not-be-accounted-as-a.patch
-
Patch21090: bcma-brcmsmac-compat.patch
-Patch21091: pci-Rework-ASPM-disable-code.patch
+Patch21091: kmemleak.patch
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
Patch50002: compat-wireless-integrated-build.patch
-Patch50003: compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
Patch50100: brcmfmac-gcc47.patch
@@ -1341,7 +1307,7 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch
#
# ARM
#
-ApplyPatch arm-omap-dt-compat.patch
+#pplyPatch arm-omap-dt-compat.patch
ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
#
@@ -1448,8 +1414,7 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
# Patches headed upstream
ApplyPatch disable-i8042-check-on-apple-mac.patch
-ApplyPatch epoll-limit-paths.patch
-ApplyPatch block-stray-block-put-after-teardown.patch
+#pplyPatch block-stray-block-put-after-teardown.patch
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
@@ -1458,54 +1423,20 @@ ApplyPatch revert-efi-rtclock.patch
ApplyPatch efi-dont-map-boot-services-on-32bit.patch
# utrace.
-ApplyPatch utrace.patch
-
-# Add msi irq ennumeration in sysfs for devices
-ApplyPatch sysfs-msi-irq-per-device.patch
+# pplyPatch utrace.patch
%if !%{with_backports}
# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
ApplyPatch bcma-brcmsmac-compat.patch
%endif
-ApplyPatch pci-Rework-ASPM-disable-code.patch
-
-#rhbz 753236
-ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
-
-#rhbz 590880
-ApplyPatch alps.patch
-
-#rhbz 717735
-ApplyPatch nfs-client-freezer.patch
-
-#rhbz 770233
-ApplyPatch Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
-
ApplyPatch ext4-Support-check-none-nocheck-mount-options.patch
-ApplyPatch ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
-
-ApplyPatch mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch
-
#rhbz 773392
ApplyPatch KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
ApplyPatch KVM-x86-fix-missing-checks-in-syscall-emulation.patch
-#rhbz 728740
-ApplyPatch rtl8192cu-Fix-WARNING-on-suspend-resume.patch
-
-#rhbz 782686
-ApplyPatch procfs-parse-mount-options.patch
-ApplyPatch procfs-add-hidepid-and-gid-mount-options.patch
-ApplyPatch proc-fix-null-pointer-deref-in-proc_pid_permission.patch
-
-#rhbz 782681
-ApplyPatch proc-clean-up-and-fix-proc-pid-mem-handling.patch
-
-#rhbz 782696
-ApplyPatch Unused-iocbs-in-a-batch-should-not-be-accounted-as-a.patch
-
+ApplyPatch kmemleak.patch
# END OF PATCH APPLICATIONS
%endif
@@ -1571,8 +1502,6 @@ cd compat-wireless-%{cwversion}
ApplyPatch compat-wireless-config-fixups.patch
ApplyPatch compat-wireless-pr_fmt-warning-avoidance.patch
ApplyPatch compat-wireless-integrated-build.patch
-ApplyPatch compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
-ApplyPatch mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch
ApplyPatch brcmfmac-gcc47.patch
@@ -2345,6 +2274,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Jan 20 2012 Josh Boyer <jwboyer at redhat.com>
+- Rebase to Linux 3.3-rc1
+
* Thu Jan 19 2012 John W. Linville <linville at redhat.com>
- Pass the same make options to compat-wireless as to the base kernel
diff --git a/kmemleak.patch b/kmemleak.patch
new file mode 100644
index 0000000..56bd860
--- /dev/null
+++ b/kmemleak.patch
@@ -0,0 +1,100 @@
+
+Delivered-To: jwboyer at gmail.com
+Received: by 10.216.166.66 with SMTP id f44cs7120wel;
+ Fri, 20 Jan 2012 03:02:14 -0800 (PST)
+Received: by 10.68.72.8 with SMTP id z8mr60494730pbu.111.1327057318390;
+ Fri, 20 Jan 2012 03:01:58 -0800 (PST)
+Return-Path: <linux-kernel-owner at vger.kernel.org>
+Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
+ by mx.google.com with ESMTP id q8si4181579pbn.101.2012.01.20.03.01.56;
+ Fri, 20 Jan 2012 03:01:58 -0800 (PST)
+Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner at vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
+Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner at vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner at vger.kernel.org
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+ id S1751460Ab2ATLBU (ORCPT <rfc822;ramashish.lists at gmail.com>
+ + 99 others); Fri, 20 Jan 2012 06:01:20 -0500
+Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:34737 "EHLO
+ cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK)
+ by vger.kernel.org with ESMTP id S1750877Ab2ATLBT (ORCPT
+ <rfc822;linux-kernel at vger.kernel.org>);
+ Fri, 20 Jan 2012 06:01:19 -0500
+Received: from arm.com (e102109-lin.cambridge.arm.com [10.1.69.68])
+ by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id q0KB1CWq000059;
+ Fri, 20 Jan 2012 11:01:12 GMT
+Date: Fri, 20 Jan 2012 11:01:11 +0000
+From: Catalin Marinas <catalin.marinas at arm.com>
+To: Dirk Gouders <gouders at et.bocholt.fh-gelsenkirchen.de>
+Cc: "linux-kernel at vger.kernel.org" <linux-kernel at vger.kernel.org>
+Subject: Re: [Problem] kernel hangs at boot (bisected 892d208bcf)
+Message-ID: <20120120110111.GB30612 at arm.com>
+References: <gi39bcyff8.fsf at mx10.gouders.net>
+ <20120119110121.GC9268 at arm.com>
+ <gi1uqvsx8n.fsf at karga.hank.lab>
+ <20120119140058.GA19036 at arm.com>
+ <gik44nrc52.fsf at karga.hank.lab>
+ <20120119153732.GB20558 at arm.com>
+ <gi1uqvwpt2.fsf at mx10.gouders.net>
+ <gimx9jv50u.fsf at mx10.gouders.net>
+ <giipk7v2hv.fsf at mx10.gouders.net>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <giipk7v2hv.fsf at mx10.gouders.net>
+Thread-Topic: [Problem] kernel hangs at boot (bisected 892d208bcf)
+Accept-Language: en-GB, en-US
+Content-Language: en-US
+User-Agent: Mutt/1.5.20 (2009-06-14)
+Sender: linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel at vger.kernel.org
+
+On Thu, Jan 19, 2012 at 08:52:44PM +0000, Dirk Gouders wrote:
+> Dirk Gouders <gouders at et.bocholt.fh-gelsenkirchen.de> writes:
+> I want to note that in my config CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF is
+> set which causes kmemleak_disable() to be called in kmemleak_init().
+
+Thanks for the investigation. Could you please try the patch below?
+Thanks.
+
+
+From 09e7bd41ff3fd07e4c5eea7bbb0a045921eb5944 Mon Sep 17 00:00:00 2001
+From: Catalin Marinas <catalin.marinas at arm.com>
+Date: Fri, 20 Jan 2012 10:42:40 +0000
+Subject: [PATCH] kmemleak: Disable early logging when kmemleak is off by
+ default
+
+Commit b6693005 (kmemleak: When the early log buffer is exceeded, report
+the actual number) deferred the disabling of the early logging to
+kmemleak_init(). However, when CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y, the
+early logging was no longer disabled causing __init kmemleak functions
+to be called even after the kernel freed the init memory. This patch
+disables the early logging during kmemleak_init() if kmemleak is left
+disabled.
+
+Reported-by: Dirk Gouders <gouders at et.bocholt.fh-gelsenkirchen.de>
+Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
+---
+ mm/kmemleak.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/mm/kmemleak.c b/mm/kmemleak.c
+index f9f7310..45eb621 100644
+--- a/mm/kmemleak.c
++++ b/mm/kmemleak.c
+@@ -1757,6 +1757,7 @@ void __init kmemleak_init(void)
+
+ #ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF
+ if (!kmemleak_skip_disable) {
++ atomic_set(&kmemleak_early_log, 0);
+ kmemleak_disable();
+ return;
+ }
+
+--
+Catalin
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at http://www.tux.org/lkml/
diff --git a/linux-2.6-defaults-acpi-video.patch b/linux-2.6-defaults-acpi-video.patch
index af883b0..b83f4b6 100644
--- a/linux-2.6-defaults-acpi-video.patch
+++ b/linux-2.6-defaults-acpi-video.patch
@@ -1,13 +1,13 @@
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index d8d7596..a1b7117 100644
+index eaef02a..2029819 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
-@@ -71,7 +71,7 @@ MODULE_AUTHOR("Bruno Ducrot");
+@@ -69,7 +69,7 @@ MODULE_AUTHOR("Bruno Ducrot");
MODULE_DESCRIPTION("ACPI Video Driver");
MODULE_LICENSE("GPL");
--static int brightness_switch_enabled = 1;
-+static int brightness_switch_enabled = 0;
+-static bool brightness_switch_enabled = 1;
++static bool brightness_switch_enabled = 0;
module_param(brightness_switch_enabled, bool, 0644);
- static int acpi_video_bus_add(struct acpi_device *device);
+ /*
diff --git a/revert-efi-rtclock.patch b/revert-efi-rtclock.patch
index 87ecaa1..3c6b74f 100644
--- a/revert-efi-rtclock.patch
+++ b/revert-efi-rtclock.patch
@@ -1,8 +1,16 @@
+commit d80d983c0fbfe0b0f6bd83c4279e1077c31e7fe4
+Author: Josh Boyer <jwboyer at redhat.com>
+Date: Fri Jan 20 10:12:15 2012 -0500
+
+ Revert "x86: Serialize EFI time accesses on rtc_lock"
+
+ This reverts commit ef68c8f87ed13f65df867dddf36c0e185b27b942.
+
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
-index 3ae4128..e17c6d2 100644
+index 4cf9bd0..457e37a 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
-@@ -89,50 +89,26 @@ early_param("add_efi_memmap", setup_add_efi_memmap);
+@@ -90,50 +90,26 @@ early_param("add_efi_memmap", setup_add_efi_memmap);
static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
{
@@ -59,7 +67,7 @@ index 3ae4128..e17c6d2 100644
}
static efi_status_t virt_efi_get_variable(efi_char16_t *name,
-@@ -232,14 +208,11 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
+@@ -233,15 +209,12 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
efi_time_cap_t *tc)
{
@@ -68,7 +76,8 @@ index 3ae4128..e17c6d2 100644
- spin_lock_irqsave(&rtc_lock, flags);
efi_call_phys_prelog();
- status = efi_call_phys2(efi_phys.get_time, tm, tc);
+ status = efi_call_phys2(efi_phys.get_time, virt_to_phys(tm),
+ virt_to_phys(tc));
efi_call_phys_epilog();
- spin_unlock_irqrestore(&rtc_lock, flags);
return status;
diff --git a/sources b/sources
index a1118d7..2505de9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz
2fed18362598429cc0669c01123290ff compat-wireless-2012-01-09.tar.bz2
-62ac6ac9b870162f693ecf5e8606423a patch-3.2.1.xz
+1c3dd34fa219420a4cbed1e573d253e7 patch-3.3-rc1.xz
More information about the scm-commits
mailing list