update to 2.6.38-git6

2011-03-18 13:15:43 -04:00 · 2011-03-18 13:15:43 -04:00 · 3f74cb629d
parent a725c00ed4
commit 3f74cb629d
16 changed files with 122 additions and 2501 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,4 +3,4 @@ patch-*.bz2
 clog
 *.rpm
 kernel-2.6.*/
-patch-2.6.38-git1.bz2
+patch-2.6.38-git6.bz2
--- a/6
+++ b/6
@ -135,3 +135,9 @@ CONFIG_STRICT_DEVMEM=y
 # CONFIG_HVC_DCC is not set

 CONFIG_SPARSE_IRQ=y
+
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+
+CONFIG_FTMAC100=m
+
+CONFIG_HWSPINLOCK_OMAP=m
--- a/80
+++ b/80
@ -570,6 +570,7 @@ CONFIG_SATA_ACARD_AHCI=m
 CONFIG_PATA_ACPI=m
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_CMD640_PCI=m
@ -760,6 +761,7 @@ CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
@ -848,6 +850,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@ -903,6 +906,9 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m

 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
@ -928,6 +934,8 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_SNMP=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_CT_PROTO_DCCP=m
@ -1017,6 +1025,19 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INET6_XFRM_MODE_BEET=m

+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
+
 #
 # SCTP Configuration (EXPERIMENTAL)
 #
@ -1078,6 +1099,9 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_BASIC=m
@ -1422,6 +1446,7 @@ CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
 CONFIG_ATH5K=m
 CONFIG_ATH5K_DEBUG=y
+# CONFIG_ATH5K_TRACER is not set
 CONFIG_ATH9K=m
 # CONFIG_ATH9K_DEBUG is not set
 CONFIG_ATH9K_DEBUGFS=y
@ -1480,7 +1505,12 @@ CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=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_LEGACY_DEVICE_TRACING is not set
 CONFIG_IWL4965=y
 CONFIG_IWL5000=y
 CONFIG_IWL3945=m
@ -1513,6 +1543,7 @@ CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT73USB=m
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
@ -1539,6 +1570,7 @@ CONFIG_WL1271_SDIO=m
 CONFIG_WL1271_SPI=m

 CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m

 #
 # Token Ring devices
@ -1598,6 +1630,8 @@ CONFIG_CAN_TSCAN1=m
 CONFIG_CAN_SLCAN=m
 CONFIG_CAN_SOFTING=m
 CONFIG_CAN_SOFTING_CS=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_PCH_CAN is not set
 CONFIG_NETROM=m
 CONFIG_ROSE=m
@ -1656,9 +1690,9 @@ CONFIG_WINBOND_FIR=m
 # Bluetooth support
 #
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
+CONFIG_BT_L2CAP=y
 CONFIG_BT_L2CAP_EXT_FEATURES=y
-CONFIG_BT_SCO=m
+CONFIG_BT_SCO=y
 CONFIG_BT_CMTP=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@ -2220,6 +2254,15 @@ CONFIG_SENSORS_W83795=m
 # CONFIG_SENSORS_W83795_FANCTRL is not set
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_MAX6639=m
+
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m

 # CONFIG_HMC6352 is not set
 # CONFIG_BMP085 is not set
@ -3004,17 +3047,19 @@ CONFIG_USB_TMC=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
 CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
 # CONFIG_USB_LIBUSUAL is not set
 CONFIG_USB_UAS=m

@ -3858,6 +3903,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_PERF=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set

@ -4173,6 +4219,8 @@ CONFIG_PM_TRACE_RTC=y
 CONFIG_R6040=m

 CONFIG_BNX2X=m
+CONFIG_SCSI_BNX2X_FCOE=m
+
 CONFIG_NOZOMI=m
 # CONFIG_TPS65010 is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
@ -4328,6 +4376,8 @@ CONFIG_USB_ATMEL=m
 # CONFIG_DX_SEP is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_RTS_PSTOR is not set
+# CONFIG_DRM_PSB is not set

 #
 # Android
@ -4493,3 +4543,9 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
+
+CONFIG_HWSPINLOCK=m
+
+CONFIG_PSTORE=y
+
+# CONFIG_AVERAGE is not set
--- a/1
+++ b/1
@ -183,6 +183,7 @@ CONFIG_PROC_VMCORE=y
 # CONFIG_IA64_MC_ERR_INJECT is not set

 CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y

 CONFIG_SENSORS_I5K_AMB=m

--- a/2
+++ b/2
@ -78,7 +78,7 @@ CONFIG_CARL9170_DEBUGFS=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y

 CONFIG_DEBUG_OBJECTS_WORK=y
-CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set

 CONFIG_DMADEVICES_DEBUG=y
 CONFIG_DMADEVICES_VDEBUG=y
--- a/2
+++ b/2
@ -338,3 +338,5 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 CONFIG_MPC512X_DMA=m

 CONFIG_KVM_GUEST=y
+
+CONFIG_I2C_MPC=m
--- a/2
+++ b/2
@ -233,3 +233,5 @@ CONFIG_SCHED_MC=y
 CONFIG_SCHED_BOOK=y

 CONFIG_STRICT_DEVMEM=y
+
+# CONFIG_WARN_DYNAMIC_STACK is not set
--- a/8
+++ b/8
@ -372,6 +372,9 @@ CONFIG_XEN_FBDEV_FRONTEND=y
 CONFIG_XEN_KBDDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_XEN_WDT=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
@ -401,6 +404,8 @@ CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 CONFIG_MACINTOSH_DRIVERS=y

 CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m

@ -421,6 +426,9 @@ CONFIG_OLPC_OPENFIRMWARE=y
 CONFIG_BATTERY_OLPC=y
 CONFIG_MOUSE_PS2_OLPC=y

+# staging
+# CONFIG_FB_OLPC_DCON is not set
+
 CONFIG_STRICT_DEVMEM=y

 # CONFIG_NO_BOOTMEM is not set
--- a/5
+++ b/5
@ -269,6 +269,8 @@ CONFIG_PROC_VMCORE=y
 CONFIG_CRASH=m

 CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m

@ -304,6 +306,9 @@ CONFIG_XEN_FBDEV_FRONTEND=y
 CONFIG_XEN_KBDDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_XEN_WDT=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
--- a/drm-nouveau-updates.patch
+++ b/drm-nouveau-updates.patch
--- a/kernel.spec
+++ b/kernel.spec
@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 1
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@ -620,7 +620,6 @@ Patch31: linux-2.6-utrace.patch
 Patch32: linux-2.6-utrace-ptrace.patch

 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
-Patch151: sparc64_fix_build_errors_with_gcc460.patch

 Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
 Patch161: linux-2.6-i386-nx-emulation.patch
@ -706,9 +705,6 @@ Patch2918: flexcop-fix-xlate_proc_name-warning.patch
 # NFSv4

 # patches headed upstream
-
-Patch12001: perf-gcc460-build-fixes.patch
-
 Patch12010: add-appleir-usb-driver.patch

 Patch12016: disable-i8042-check-on-apple-mac.patch
@ -722,7 +718,6 @@ Patch12102: efifb_update.patch
 Patch12200: acpi_reboot.patch

 # Runtime power management
-Patch12202: linux-2.6-ehci-check-port-status.patch
 Patch12203: linux-2.6-usb-pci-autosuspend.patch
 Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
 Patch12205: runtime_pm_fixups.patch
@ -1191,7 +1186,6 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
 # SPARC64
 #
 ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
-ApplyPatch sparc64_fix_build_errors_with_gcc460.patch

 #
 # Exec shield
@ -1303,7 +1297,7 @@ ApplyOptionalPatch drm-nouveau-updates.patch
 ApplyOptionalPatch drm-intel-next.patch
 ApplyPatch drm-intel-make-lvds-work.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
-ApplyPatch drm-intel-edp-fixes.patch
+#ApplyPatch drm-intel-edp-fixes.patch
 # rhbz#681285 (i965: crash in brw_wm_surface_state.c::prepare_wm_surfaces()
 #  where intelObj->mt == NULL)
 #ApplyPatch drm-i915-gen4-has-non-power-of-two-strides.patch
@ -1334,8 +1328,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
 ApplyPatch flexcop-fix-xlate_proc_name-warning.patch

 # Patches headed upstream
-ApplyPatch perf-gcc460-build-fixes.patch
-
 ApplyPatch disable-i8042-check-on-apple-mac.patch

 ApplyPatch add-appleir-usb-driver.patch
@ -1348,7 +1340,6 @@ ApplyPatch efifb_update.patch
 ApplyPatch acpi_reboot.patch

 # Runtime PM
-ApplyPatch linux-2.6-ehci-check-port-status.patch
 #ApplyPatch linux-2.6-usb-pci-autosuspend.patch
 ### Broken by implicit notify support & ACPICA rebase
 ###ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch
@ -1968,6 +1959,15 @@ fi
 # and build.

 %changelog
+* Fri Mar 18 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc0.git6.0
+- Update to 2.6.38-git6
+- CONFIG_IP_SET modules and associated netfilter goo.
+- New network packet scheduler modules (sch, choke, mqprio.)
+- Enable DMI sysfs interface (built-in) on ia64, x86_64, i386.
+- Explicitly set USB storage goo as modular.
+- Drop merged patches, nil-ify drm-nouveau-updates, fix context in crash.ko
+  Kconfig diff.
+
 * Thu Mar 17 2011 Matthew Garrett <mjg@redhat.com>
 - drop efi_default_physical.patch - it's actually setting up something that's
  neither physical nor virtual, and it's probably breaking EFI boots
--- a/linux-2.6-crash-driver.patch
+++ b/linux-2.6-crash-driver.patch
@ -220,20 +220,6 @@ index 5eb1ba7..3e525d2 100644
 /*
  * Fix up the linear direct mapping of the kernel to avoid cache attribute
  * conflicts.
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 3141dd3..153658c 100644
--- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -471,6 +471,8 @@ config LEGACY_PTYS
- 	  security.  This option enables these legacy devices; on most
- 	  systems, it is safe to say N.
- 
-+config CRASH
-+        tristate "Crash Utility memory driver"
- 
- config LEGACY_PTY_COUNT
- 	int "Maximum number of legacy PTY in use"
- 
 diff --git a/drivers/char/crash.c b/drivers/char/crash.c
 new file mode 100644
 index 0000000..e5437de
@ -379,3 +365,18 @@ index ba53ec9..6588b33 100644
 js-rtc-y = rtc.o
 +
 +obj-$(CONFIG_CRASH)		+= crash.o
+
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 04f8b2d..e8fb997 100644
+--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
+@@ -4,6 +4,9 @@
+ 
+ menu "Character devices"
+ 
+config CRASH
+	tristate "Crash Utility memory driver"
+
+ source "drivers/tty/Kconfig"
+ 
+ config DEVKMEM
--- a/linux-2.6-ehci-check-port-status.patch
+++ b/linux-2.6-ehci-check-port-status.patch
@ -1,54 +0,0 @@
-commit e17a07a9e0b62d5a5f0a5683ecbabad3aa95a4d5
-Author: Matthew Garrett <mjg@redhat.com>
-Date:   Tue Jan 11 12:19:40 2011 -0500
-
-    ehci: Check individual port status registers on resume
-    
-    If a device plug/unplug is detected on an ATI SB700 USB controller in D3,
-    it appears to set the port status register but not the controller status
-    register. As a result we'll fail to detect the plug event. Check the port
-    status register on resume as well in order to catch this case.
-    
-    Signed-off-by: Matthew Garrett <mjg@redhat.com>
-
-diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
-index 796ea0c..d9c0748 100644
--- a/drivers/usb/host/ehci-hub.c
-+++ b/drivers/usb/host/ehci-hub.c
-@@ -106,6 +106,27 @@ static void ehci_handover_companion_ports(struct ehci_hcd *ehci)
- 	ehci->owned_ports = 0;
- }
- 
-+static int ehci_port_change(struct ehci_hcd *ehci)
-+{
-+	int i = HCS_N_PORTS(ehci->hcs_params);
-+
-+	/* First check if the controller indicates a change event */
-+
-+	if (ehci_readl(ehci, &ehci->regs->status) & STS_PCD)
-+		return 1;
-+
-+	/*
-+	 * Not all controllers appear to update this while going from D3 to D0,
-+	 * so check the individual port status registers as well
-+	 */
-+
-+	while (i--)
-+		if (ehci_readl(ehci, &ehci->regs->port_status[i]) & PORT_CSC)
-+			return 1;
-+
-+	return 0;
-+}
-+
- static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
- 		bool suspending, bool do_wakeup)
- {
-@@ -168,7 +189,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
- 	}
- 
- 	/* Does the root hub have a port wakeup pending? */
-	if (!suspending && (ehci_readl(ehci, &ehci->regs->status) & STS_PCD))
-+	if (!suspending && ehci_port_change(ehci))
- 		usb_hcd_resume_root_hub(ehci_to_hcd(ehci));
- 
- 	spin_unlock_irqrestore(&ehci->lock, flags);
--- a/perf-gcc460-build-fixes.patch
+++ b/perf-gcc460-build-fixes.patch
@ -1,227 +0,0 @@
-From linux-kernel-owner@vger.kernel.org Mon Jan 24 11:13:12 2011
-Date:	Mon, 24 Jan 2011 11:13:04 -0500
-From:	Kyle McMartin <kyle@mcmartin.ca>
-To:	mingo@redhat.com
-Cc:	linux-kernel@vger.kernel.org, acme@redhat.com
-Subject: [PATCH] perf: fix gcc 4.6.0 issues with tools/perf
-Message-ID: <20110124161304.GK27353@bombadil.infradead.org>
-
-Hi Ingo,
-
-GCC 4.6.0 in Fedora rawhide turned up some compile errors in tools/perf
-due to the -Werror=unused-but-set-variable flag.
-
-I've gone through and annotated some of the assignments that had side
-effects (ie: return value from a function) with the __used annotation,
-and in some cases, just removed unused code.
-
-In a few cases, we were assigning something useful, but not using it in
-later parts of the function.
-
-regards, Kyle
-
-kyle@dreadnought:~/src% gcc --version
-gcc (GCC) 4.6.0 20110122 (Red Hat 4.6.0-0.3)
-
---
-
- bench/sched-pipe.c                          |    2 +-
- builtin-sched.c                             |   12 +++---------
- builtin-top.c                               |    5 +----
- util/header.c                               |    2 +-
- util/hist.c                                 |    3 ---
- util/scripting-engines/trace-event-python.c |    3 +--
- util/symbol.c                               |    4 ++--
- util/trace-event-parse.c                    |    2 +-
- util/ui/browsers/map.c                      |    2 +-
- 9 files changed, 11 insertions(+), 24 deletions(-)
-
-diff --git a/tools/perf/bench/sched-pipe.c b/tools/perf/bench/sched-pipe.c
-index d9ab3ce..0c7454f 100644
--- a/tools/perf/bench/sched-pipe.c
-+++ b/tools/perf/bench/sched-pipe.c
-@@ -55,7 +55,7 @@ int bench_sched_pipe(int argc, const char **argv,
- 	 * discarding returned value of read(), write()
- 	 * causes error in building environment for perf
- 	 */
-	int ret, wait_stat;
-+	int __used ret, wait_stat;
- 	pid_t pid, retpid;
- 
- 	argc = parse_options(argc, argv, options,
-diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
-index 29e7ffd..f9e304f 100644
--- a/tools/perf/builtin-sched.c
-+++ b/tools/perf/builtin-sched.c
-@@ -369,11 +369,6 @@ static void
- process_sched_event(struct task_desc *this_task __used, struct sched_atom *atom)
- {
- 	int ret = 0;
-	u64 now;
-	long long delta;
-
-	now = get_nsecs();
-	delta = start_time + atom->timestamp - now;
- 
- 	switch (atom->type) {
- 		case SCHED_EVENT_RUN:
-@@ -562,7 +557,7 @@ static void wait_for_tasks(void)
- 
- static void run_one_test(void)
- {
-	u64 T0, T1, delta, avg_delta, fluct, std_dev;
-+	u64 T0, T1, delta, avg_delta, fluct;
- 
- 	T0 = get_nsecs();
- 	wait_for_tasks();
-@@ -578,7 +573,6 @@ static void run_one_test(void)
- 	else
- 		fluct = delta - avg_delta;
- 	sum_fluct += fluct;
-	std_dev = sum_fluct / nr_runs / sqrt(nr_runs);
- 	if (!run_avg)
- 		run_avg = delta;
- 	run_avg = (run_avg*9 + delta)/10;
-@@ -799,7 +793,7 @@ replay_switch_event(struct trace_switch_event *switch_event,
- 		    u64 timestamp,
- 		    struct thread *thread __used)
- {
-	struct task_desc *prev, *next;
-+	struct task_desc *prev, __used *next;
- 	u64 timestamp0;
- 	s64 delta;
- 
-@@ -1404,7 +1398,7 @@ map_switch_event(struct trace_switch_event *switch_event,
- 		 u64 timestamp,
- 		 struct thread *thread __used)
- {
-	struct thread *sched_out, *sched_in;
-+	struct thread *sched_out __used, *sched_in;
- 	int new_shortname;
- 	u64 timestamp0;
- 	s64 delta;
-diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
-index 05344c6..373cfc0 100644
--- a/tools/perf/builtin-top.c
-+++ b/tools/perf/builtin-top.c
-@@ -182,7 +182,6 @@ static int parse_source(struct sym_entry *syme)
- 	FILE *file;
- 	char command[PATH_MAX*2];
- 	const char *path;
-	u64 len;
- 
- 	if (!syme)
- 		return -1;
-@@ -211,8 +210,6 @@ static int parse_source(struct sym_entry *syme)
- 	}
- 	path = map->dso->long_name;
- 
-	len = sym->end - sym->start;
-
- 	sprintf(command,
- 		"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)
- {
- 	pthread_t thread;
- 	struct perf_evsel *counter;
-	int i, ret;
-+	int i, ret __used;
- 	/*
- 	 * FIXME: perf_session__new should allow passing a O_MMAP, so that all this
- 	 * mmap reading, etc is encapsulated in it. Use O_WRONLY for now.
-diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
-index 989fa2d..c0e5019 100644
--- a/tools/perf/util/header.c
-+++ b/tools/perf/util/header.c
-@@ -1139,7 +1139,7 @@ int event__synthesize_tracing_data(int fd, struct list_head *pattrs,
- {
- 	event_t ev;
- 	ssize_t size = 0, aligned_size = 0, padding;
-	int err = 0;
-+	int err __used = 0;
- 
- 	memset(&ev, 0, sizeof(ev));
- 
-diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
-index c749ba6..a01a33d 100644
--- a/tools/perf/util/hist.c
-+++ b/tools/perf/util/hist.c
-@@ -1091,7 +1091,6 @@ int hist_entry__annotate(struct hist_entry *self, struct list_head *head,
- 	char command[PATH_MAX * 2];
- 	FILE *file;
- 	int err = 0;
-	u64 len;
- 	char symfs_filename[PATH_MAX];
- 
- 	if (filename) {
-@@ -1136,8 +1135,6 @@ fallback:
- 		 filename, sym->name, map->unmap_ip(map, sym->start),
- 		 map->unmap_ip(map, sym->end));
- 
-	len = sym->end - sym->start;
-
- 	pr_debug("annotating [%p] %30s : [%p] %30s\n",
- 		 dso, dso->long_name, sym, sym->name);
- 
-diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
-index c6d9933..2040b85 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
-+++ b/tools/perf/util/scripting-engines/trace-event-python.c
-@@ -248,8 +248,7 @@ static void python_process_event(int cpu, void *data,
- 	context = PyCObject_FromVoidPtr(scripting_context, NULL);
- 
- 	PyTuple_SetItem(t, n++, PyString_FromString(handler_name));
-	PyTuple_SetItem(t, n++,
-			PyCObject_FromVoidPtr(scripting_context, NULL));
-+	PyTuple_SetItem(t, n++, context);
- 
- 	if (handler) {
- 		PyTuple_SetItem(t, n++, PyInt_FromLong(cpu));
-diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
-index 15ccfba..52e82cf 100644
--- a/tools/perf/util/symbol.c
-+++ b/tools/perf/util/symbol.c
-@@ -1517,8 +1517,8 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
- 			     symbol_conf.symfs, self->long_name);
- 			break;
- 		case DSO__ORIG_GUEST_KMODULE:
-			if (map->groups && map->groups->machine)
-				root_dir = map->groups->machine->root_dir;
-+			if (map->groups && machine)
-+				root_dir = machine->root_dir;
- 			else
- 				root_dir = "";
- 			snprintf(name, size, "%s%s%s", symbol_conf.symfs,
-diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
-index 73a0222..d8e622d 100644
--- a/tools/perf/util/trace-event-parse.c
-+++ b/tools/perf/util/trace-event-parse.c
-@@ -153,7 +153,7 @@ void parse_proc_kallsyms(char *file, unsigned int size __unused)
- 	char *next = NULL;
- 	char *addr_str;
- 	char ch;
-	int ret;
-+	int ret __used;
- 	int i;
- 
- 	line = strtok_r(file, "\n", &next);
-diff --git a/tools/perf/util/ui/browsers/map.c b/tools/perf/util/ui/browsers/map.c
-index e35437d..3788cad 100644
--- a/tools/perf/util/ui/browsers/map.c
-+++ b/tools/perf/util/ui/browsers/map.c
-@@ -40,7 +40,7 @@ static int ui_entry__read(const char *title, char *bf, size_t size, int width)
- out_free_form:
- 	newtPopWindow();
- 	newtFormDestroy(form);
-	return 0;
-+	return err;
- }
- 
- struct map_browser {
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 7d471477bfa67546f902da62227fa976  linux-2.6.38.tar.bz2
-3a6059385b1b495a4e0b63ec8a51a6e9  patch-2.6.38-git1.bz2
+590b2c3425d72c110658e998c9ad01b7  patch-2.6.38-git6.bz2
--- a/sparc64_fix_build_errors_with_gcc460.patch
+++ b/sparc64_fix_build_errors_with_gcc460.patch
@ -1,305 +0,0 @@
-From dbb988cf34a62e69c8863f212be212c6841004ba Mon Sep 17 00:00:00 2001
-From: David S. Miller <davem@davemloft.net>
-Date: Sat, 26 Feb 2011 23:40:02 -0800
-Subject: [PATCH] sparc64: Fix build errors with gcc-4.6.0
-
-Most of the warnings emitted (we fail arch/sparc file
-builds with -Werror) were legitimate but harmless, however
-one case (n2_pcr_write) was a genuine bug.
-
-Based almost entirely upon a patch by Sam Ravnborg.
-
-Reported-by: Dennis Gilmore <dennis@ausil.us>
-Signed-off-by: David S. Miller <davem@davemloft.net>
---
- arch/sparc/kernel/iommu.c      |    3 ---
- arch/sparc/kernel/ldc.c        |   28 ++++++++++++++++++----------
- arch/sparc/kernel/pci.c        |    1 +
- arch/sparc/kernel/pci_common.c |   11 +++++++----
- arch/sparc/kernel/pci_fire.c   |    2 --
- arch/sparc/kernel/pci_schizo.c |    4 +---
- arch/sparc/kernel/pci_sun4v.c  |    3 +--
- arch/sparc/kernel/pcr.c        |    2 +-
- arch/sparc/kernel/ptrace_64.c  |    3 ++-
- arch/sparc/kernel/smp_64.c     |   11 ++++-------
- arch/sparc/kernel/traps_64.c   |    3 +--
- 11 files changed, 36 insertions(+), 35 deletions(-)
-
-diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
-index 72509d0..6f01e8c 100644
--- a/arch/sparc/kernel/iommu.c
-+++ b/arch/sparc/kernel/iommu.c
-@@ -333,13 +333,10 @@ static void dma_4u_free_coherent(struct device *dev, size_t size,
- 				 void *cpu, dma_addr_t dvma)
- {
- 	struct iommu *iommu;
-	iopte_t *iopte;
- 	unsigned long flags, order, npages;
- 
- 	npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;
- 	iommu = dev->archdata.iommu;
-	iopte = iommu->page_table +
-		((dvma - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
- 
- 	spin_lock_irqsave(&iommu->lock, flags);
- 
-diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
-index df39a0f..732b0bc 100644
--- a/arch/sparc/kernel/ldc.c
-+++ b/arch/sparc/kernel/ldc.c
-@@ -790,16 +790,20 @@ static void send_events(struct ldc_channel *lp, unsigned int event_mask)
- static irqreturn_t ldc_rx(int irq, void *dev_id)
- {
- 	struct ldc_channel *lp = dev_id;
-	unsigned long orig_state, hv_err, flags;
-+	unsigned long orig_state, flags;
- 	unsigned int event_mask;
- 
- 	spin_lock_irqsave(&lp->lock, flags);
- 
- 	orig_state = lp->chan_state;
-	hv_err = sun4v_ldc_rx_get_state(lp->id,
-					&lp->rx_head,
-					&lp->rx_tail,
-					&lp->chan_state);
-+
-+	/* We should probably check for hypervisor errors here and
-+	 * reset the LDC channel if we get one.
-+	 */
-+	sun4v_ldc_rx_get_state(lp->id,
-+			       &lp->rx_head,
-+			       &lp->rx_tail,
-+			       &lp->chan_state);
- 
- 	ldcdbg(RX, "RX state[0x%02lx:0x%02lx] head[0x%04lx] tail[0x%04lx]\n",
- 	       orig_state, lp->chan_state, lp->rx_head, lp->rx_tail);
-@@ -904,16 +908,20 @@ out:
- static irqreturn_t ldc_tx(int irq, void *dev_id)
- {
- 	struct ldc_channel *lp = dev_id;
-	unsigned long flags, hv_err, orig_state;
-+	unsigned long flags, orig_state;
- 	unsigned int event_mask = 0;
- 
- 	spin_lock_irqsave(&lp->lock, flags);
- 
- 	orig_state = lp->chan_state;
-	hv_err = sun4v_ldc_tx_get_state(lp->id,
-					&lp->tx_head,
-					&lp->tx_tail,
-					&lp->chan_state);
-+
-+	/* We should probably check for hypervisor errors here and
-+	 * reset the LDC channel if we get one.
-+	 */
-+	sun4v_ldc_tx_get_state(lp->id,
-+			       &lp->tx_head,
-+			       &lp->tx_tail,
-+			       &lp->chan_state);
- 
- 	ldcdbg(TX, " TX state[0x%02lx:0x%02lx] head[0x%04lx] tail[0x%04lx]\n",
- 	       orig_state, lp->chan_state, lp->tx_head, lp->tx_tail);
-diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
-index 4137579..f255382 100644
--- a/arch/sparc/kernel/pci.c
-+++ b/arch/sparc/kernel/pci.c
-@@ -675,6 +675,7 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)
- 		 * humanoid.
- 		 */
- 		err = sysfs_create_file(&dev->dev.kobj, &dev_attr_obppath.attr);
-+		(void) err;
- 	}
- 	list_for_each_entry(child_bus, &bus->children, node)
- 		pci_bus_register_of_sysfs(child_bus);
-diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
-index 6c7a33a..6e3874b 100644
--- a/arch/sparc/kernel/pci_common.c
-+++ b/arch/sparc/kernel/pci_common.c
-@@ -295,14 +295,17 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
- 	unsigned int bus = bus_dev->number;
- 	unsigned int device = PCI_SLOT(devfn);
- 	unsigned int func = PCI_FUNC(devfn);
-	unsigned long ret;
- 
- 	if (config_out_of_range(pbm, bus, devfn, where)) {
- 		/* Do nothing. */
- 	} else {
-		ret = pci_sun4v_config_put(devhandle,
-				HV_PCI_DEVICE_BUILD(bus, device, func),
-				where, size, value);
-+		/* We don't check for hypervisor errors here, but perhaps
-+		 * we should and influence our return value depending upon
-+		 * what kind of error is thrown.
-+		 */
-+		pci_sun4v_config_put(devhandle,
-+				     HV_PCI_DEVICE_BUILD(bus, device, func),
-+				     where, size, value);
- 	}
- 	return PCIBIOS_SUCCESSFUL;
- }
-diff --git a/arch/sparc/kernel/pci_fire.c b/arch/sparc/kernel/pci_fire.c
-index efb896d..75dfeb6 100644
--- a/arch/sparc/kernel/pci_fire.c
-+++ b/arch/sparc/kernel/pci_fire.c
-@@ -214,11 +214,9 @@ static int pci_fire_msi_setup(struct pci_pbm_info *pbm, unsigned long msiqid,
- 
- static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)
- {
-	unsigned long msiqid;
- 	u64 val;
- 
- 	val = upa_readq(pbm->pbm_regs + MSI_MAP(msi));
-	msiqid = (val & MSI_MAP_EQNUM);
- 
- 	val &= ~MSI_MAP_VALID;
- 
-diff --git a/arch/sparc/kernel/pci_schizo.c b/arch/sparc/kernel/pci_schizo.c
-index 445a47a..4620eb7 100644
--- a/arch/sparc/kernel/pci_schizo.c
-+++ b/arch/sparc/kernel/pci_schizo.c
-@@ -1313,7 +1313,7 @@ static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,
- 	const struct linux_prom64_registers *regs;
- 	struct device_node *dp = op->dev.of_node;
- 	const char *chipset_name;
-	int is_pbm_a, err;
-+	int err;
- 
- 	switch (chip_type) {
- 	case PBM_CHIP_TYPE_TOMATILLO:
-@@ -1343,8 +1343,6 @@ static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,
- 	 */
- 	regs = of_get_property(dp, "reg", NULL);
- 
-	is_pbm_a = ((regs[0].phys_addr & 0x00700000) == 0x00600000);
-
- 	pbm->next = pci_pbm_root;
- 	pci_pbm_root = pbm;
- 
-diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
-index 743344a..859abfd 100644
--- a/arch/sparc/kernel/pci_sun4v.c
-+++ b/arch/sparc/kernel/pci_sun4v.c
-@@ -580,7 +580,7 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
- {
- 	static const u32 vdma_default[] = { 0x80000000, 0x80000000 };
- 	struct iommu *iommu = pbm->iommu;
-	unsigned long num_tsb_entries, sz, tsbsize;
-+	unsigned long num_tsb_entries, sz;
- 	u32 dma_mask, dma_offset;
- 	const u32 *vdma;
- 
-@@ -596,7 +596,6 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
- 
- 	dma_mask = (roundup_pow_of_two(vdma[1]) - 1UL);
- 	num_tsb_entries = vdma[1] / IO_PAGE_SIZE;
-	tsbsize = num_tsb_entries * sizeof(iopte_t);
- 
- 	dma_offset = vdma[0];
- 
-diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
-index 7c2ced6..8ac23e6 100644
--- a/arch/sparc/kernel/pcr.c
-+++ b/arch/sparc/kernel/pcr.c
-@@ -81,7 +81,7 @@ static void n2_pcr_write(u64 val)
- 	unsigned long ret;
- 
- 	ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
-	if (val != HV_EOK)
-+	if (ret != HV_EOK)
- 		write_pcr(val);
- }
- 
-diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
-index 9ccc812..96ee50a 100644
--- a/arch/sparc/kernel/ptrace_64.c
-+++ b/arch/sparc/kernel/ptrace_64.c
-@@ -1086,6 +1086,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
- 
- asmlinkage void syscall_trace_leave(struct pt_regs *regs)
- {
-+#ifdef CONFIG_AUDITSYSCALL
- 	if (unlikely(current->audit_context)) {
- 		unsigned long tstate = regs->tstate;
- 		int result = AUDITSC_SUCCESS;
-@@ -1095,7 +1096,7 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
- 
- 		audit_syscall_exit(result, regs->u_regs[UREG_I0]);
- 	}
-
-+#endif
- 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
- 		trace_sys_exit(regs, regs->u_regs[UREG_G1]);
- 
-diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
-index 555a76d..3e94a8c 100644
--- a/arch/sparc/kernel/smp_64.c
-+++ b/arch/sparc/kernel/smp_64.c
-@@ -189,7 +189,7 @@ static inline long get_delta (long *rt, long *master)
- void smp_synchronize_tick_client(void)
- {
- 	long i, delta, adj, adjust_latency = 0, done = 0;
-	unsigned long flags, rt, master_time_stamp, bound;
-+	unsigned long flags, rt, master_time_stamp;
- #if DEBUG_TICK_SYNC
- 	struct {
- 		long rt;	/* roundtrip time */
-@@ -208,10 +208,8 @@ void smp_synchronize_tick_client(void)
- 	{
- 		for (i = 0; i < NUM_ROUNDS; i++) {
- 			delta = get_delta(&rt, &master_time_stamp);
-			if (delta == 0) {
-+			if (delta == 0)
- 				done = 1;	/* let's lock on to this... */
-				bound = rt;
-			}
- 
- 			if (!done) {
- 				if (i > 0) {
-@@ -933,13 +931,12 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
- void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
- {
- 	void *pg_addr;
-	int this_cpu;
- 	u64 data0;
- 
- 	if (tlb_type == hypervisor)
- 		return;
- 
-	this_cpu = get_cpu();
-+	preempt_disable();
- 
- #ifdef CONFIG_DEBUG_DCFLUSH
- 	atomic_inc(&dcpage_flushes);
-@@ -964,7 +961,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
- 	}
- 	__local_flush_dcache_page(page);
- 
-	put_cpu();
-+	preempt_enable();
- }
- 
- void __irq_entry smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
-diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
-index 42ad2ba..9456472 100644
--- a/arch/sparc/kernel/traps_64.c
-+++ b/arch/sparc/kernel/traps_64.c
-@@ -2152,7 +2152,7 @@ static void user_instruction_dump(unsigned int __user *pc)
- 
- void show_stack(struct task_struct *tsk, unsigned long *_ksp)
- {
-	unsigned long fp, thread_base, ksp;
-+	unsigned long fp, ksp;
- 	struct thread_info *tp;
- 	int count = 0;
- #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-@@ -2173,7 +2173,6 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
- 		flushw_all();
- 
- 	fp = ksp + STACK_BIAS;
-	thread_base = (unsigned long) tp;
- 
- 	printk("Call Trace:\n");
- 	do {
-- 
-1.7.4.1
-