commit ac50e950784cae1c26ad9e09ebd8f8c706131eb3 Merge: 5743695 6c06f07 Author: Linus Torvalds Date: Tue Nov 17 09:42:35 2009 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: copy li_lsn before dropping AIL lock XFS bug in log recover with quota (bugzilla id 855) commit 5743695b0dd2c775b71d3d4541c243df3da964db Merge: 8a1eaa6 b1e69aa Author: Linus Torvalds Date: Tue Nov 17 09:20:50 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: lifebook - fix settings for CF-72 Input: psmouse - fix breakage introduced by b7802c5c1ea commit 8a1eaa6a5697c4554ecacbd021c668f51318c09e Merge: a044a1b f534dc9 Author: Linus Torvalds Date: Tue Nov 17 09:20:38 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: clear server inode number flag while autodisabling commit a044a1b147a1c967e1a4b797c3e24c395f3d878a Merge: b1219e2 112a674 Author: Linus Torvalds Date: Tue Nov 17 09:19:54 2009 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: ensure mfp is in correct range in mfp_{read,write} [ARM] pxa/hx4700: fix hx4700 touchscreen pressure values ARM: 5787/1: U300 COH 901 331 fixes ARM: Fix warning in sa1100-flash.c [ARM] Kirkwood: disable propagation of mbus error to the CPU local bus [ARM] pxa: fix incorrect mfp_to_gpio() conversion [ARM] pxa/colibri: fix AC97 ifdefs and add missing include [ARM] pxa: fix missing underscores in mfp-pxa910.h [ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y commit b1219e24c09c60b903c422861378c3b99bfbbde1 Merge: 7b01773 80099c7 Author: Linus Torvalds Date: Tue Nov 17 09:19:27 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: dereferencing freed memory regulator_fixed_voltage_remove() regulator: Fix check of unsigned return value and transmit errors in wm831x_gp_ldo_get_mode() regulator: Handle missing constraints in _regulator_disable() commit 7b01773bfd12bf280d2b7584e5541bed475a7013 Merge: ee49a27 0f74296 Author: Linus Torvalds Date: Tue Nov 17 09:19:13 2009 -0800 Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91 * 'for-linus' of git://github.com/at91linux/linux-2.6-at91: at91: at91sam9g20ek modify dual slot evaluation kit commit ee49a277e6daaa52e846be264246bd809d2c5fff Merge: 3026a9b 84d2a31 Author: Linus Torvalds Date: Tue Nov 17 09:17:40 2009 -0800 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (adt7475) Fix sysfs file names hwmon: (adt7475) Cache limits for 60 seconds hwmon: (adt7475) Fix temperature fault flags hwmon: (s3c-hwmon) Ignore invalid divider settings commit 3026a9b0515976f06ff49705d6f642b671731aac Merge: a2eb473 0b4634f Author: Linus Torvalds Date: Tue Nov 17 09:16:57 2009 -0800 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds: leds-gpio: fix possible crash on OF device unbinding backlight: Fix backlight limiting on spitz/corgi devices backlight: lcd - Fix wrong sizeof commit a2eb473d93971e322a47089ef8df956f51b8936a Merge: 82abc2a 828d445 Author: Linus Torvalds Date: Tue Nov 17 09:15:48 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ice1724 - make some bitfields unsigned ALSA: hda - Dell Studio 1557 hd-audio quirk ALSA: ice1724 - Fix section mismatch in prodigy_hd2_resume() ALSA: hda - Add another Nvidia HDMI codec id (10de:0005) ALSA: hda: Use model=mb5 for MacBookPro 5,2 commit 82abc2a97a4a3c7635c40e6dff571816062ec506 Merge: cb20c28 18dafac Author: Linus Torvalds Date: Tue Nov 17 09:15:18 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: deleted inconsistent comment in nilfs_load_inode_block() nilfs2: deleted struct nilfs_dat_group_desc nilfs2: fix lock order reversal in chcp operation commit cb20c28a9c41052c2d7220325dae60c16f417ded Merge: a08e37f 25583d4 Author: Linus Torvalds Date: Tue Nov 17 09:14:49 2009 -0800 Merge branch 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc * 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc: Makefile: Add -Wmising-prototypes to HOSTCFLAGS oss: Mark loadhex static in hex2hex.c dtc: Mark various internal functions static dtc: Set "noinput" in the lexer to avoid an unused function drm: radeon: Mark several functions static in mkregtable arch/sparc/boot/*.c: Mark various internal functions static arch/powerpc/boot/addRamDisk.c: Mark several internal functions static arch/alpha/boot/tools/objstrip.c: Mark "usage" static Documentation/vm/page-types.c: Declare checked_open static genksyms: Mark is_reserved_word static kconfig: Mark various internal functions static kconfig: Make zconf.y work with current bison commit a08e37f31aa2800e0c9d20e1fc9283a06901cac2 Author: Stephen Rothwell Date: Sat Nov 14 20:45:06 2009 +1100 fcntl: Use consistent values for F_[GS]ETOWN_EX These values were only introduced during this release cycle, so it is still early enough to get them right. alpha uses the same values that are in asm-generic/fcntl.h, so just remove them. parisc uses the values interchanged for no apparent reason, so remove them to give us consistency across all architectures. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 6c06f072c2d797ddbb2270363de97c53ebbe0385 Author: Nathaniel W. Turner Date: Mon Nov 16 19:51:48 2009 +0000 xfs: copy li_lsn before dropping AIL lock Access to log items on the AIL is generally protected by m_ail_lock; this is particularly needed when we're getting or setting the 64-bit li_lsn on a 32-bit platform. This patch fixes a couple places where we were accessing the log item after dropping the AIL lock on 32-bit machines. This can result in a partially-zeroed log->l_tail_lsn if xfs_trans_ail_delete is racing with xfs_trans_ail_update, and in at least some cases, this can leave the l_tail_lsn with a zero cycle number, which means xlog_space_left will think the log is full (unless CONFIG_XFS_DEBUG is set, in which case we'll trip an ASSERT), leading to processes stuck forever in xlog_grant_log_space. Thanks to Adrian VanderSpek for first spotting the race potential and to Dave Chinner for debug assistance. Signed-off-by: Nathaniel W. Turner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 8ec6dba2581754e375be66f7bedd708d856d8b30 Author: Jan Rekorajski Date: Mon Nov 16 11:57:02 2009 +0000 XFS bug in log recover with quota (bugzilla id 855) Hi, I was hit by a bug in linux 2.6.31 when XFS is not able to recover the log after a crash if fs was mounted with quotas. Gory details in XFS bugzilla: http://oss.sgi.com/bugzilla/show_bug.cgi?id=855. It looks like wrong struct is used in buffer length check, and the following patch should fix the problem. xfs_dqblk_t has a size of 104+32 bytes, while xfs_disk_dquot_t is 104 bytes long, and this is exactly what I see in system logs - "XFS: dquot too small (104) in xlog_recover_do_dquot_trans." Signed-off-by: Jan Rekorajski Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit b1e69aae77d02424ad67f337e40d439313554269 Author: Abner Holsinger <9zabner@gmail.com> Date: Mon Nov 16 22:12:14 2009 -0800 Input: lifebook - fix settings for CF-72 Panasonic CF-72 uses 6-byte protocol and does not need to be tied to a particular port. Signed-off-by: Abner Holsinger <9zabner@gmail.com> Signed-off-by: Dmitry Torokhov commit 0698989d779a994e1a6ef2f83625276f4dde6eb6 Author: Jiri Kosina Date: Mon Nov 16 22:12:13 2009 -0800 Input: psmouse - fix breakage introduced by b7802c5c1ea Commit b7802c5c1ea ("Input: psmouse - use boolean type") caused the synaptics_hardware variable to be completely useless, as it is constantly set to 'true' throughout the whole psmouse_extensions(). This was caused by the following hunk in the commit in question - int synaptics_hardware = 0; + bool synaptics_hardware = true; which is wrong and causes driver to issue extra reset when falling back to bare PS/2 protocol. Signed-off-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit 112a674f2f68b17ae253fe7312afc38c3e75be7a Merge: e12399f 7df56c2 Author: Russell King Date: Mon Nov 16 20:59:25 2009 +0000 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit 7df56c2586049a06b007474ca059779c81ddb1ff Author: Roel Kluin Date: Fri Nov 13 11:37:34 2009 +0100 [ARM] pxa: ensure mfp is in correct range in mfp_{read,write} Ensure we do not read/write outside array boundaries with a negative index. Signed-off-by: Roel Kluin Signed-off-by: Eric Miao commit 10d5d99e880692a31ddc59b9f5d063e928fc0c89 Author: Paul Parsons Date: Sat Nov 14 16:54:12 2009 +0000 [ARM] pxa/hx4700: fix hx4700 touchscreen pressure values hx4700 touchscreen events were being dropped in ads7846_rx() because their pressure values consistently exceeded the platform maximum of 512; a sample of 256 pressure values were in the range 531 to 815. Doubling the platform maximum to 1024 allows hx4700 touchscreen events to pass the test. Signed-off-by: Paul Parsons Signed-off-by: Eric Miao commit e12399fec3793e0c2b75d366c7fd48a360f6e328 Merge: 378ce74 2bf3010 Author: Russell King Date: Mon Nov 16 16:28:15 2009 +0000 Merge branch 'for-rmk' of git://git.marvell.com/orion commit 378ce74bee4cb0183489bc0f850790a2264ca975 Author: Linus Walleij Date: Sat Nov 14 01:03:24 2009 +0100 ARM: 5787/1: U300 COH 901 331 fixes This will fix some small issues with the COH 901 331 RTC driver: - Interrupt is disabled after alarm so that we don't fire multiple interrupts. - We return 0 from the coh901331_alarm_irq_enable() ridding a compile warning. - We alter the name in the U300 device registry to match that of the driver so they sucessfully resolve. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 927585f650b51639f0262dad650eafeaf1611197 Author: Russell King Date: Mon Nov 16 16:13:35 2009 +0000 ARM: Fix warning in sa1100-flash.c drivers/mtd/maps/sa1100-flash.c: In function 'sa1100_probe_subdev': drivers/mtd/maps/sa1100-flash.c:214: warning: format '%d' expects type 'int', but argument 3 has type 'uint64_t' Signed-off-by: Russell King commit 0f74296a0f818d8ae52d9b77ec531e8dd804dda3 Author: Nicolas Ferre Date: Tue Oct 20 16:32:53 2009 +0200 at91: at91sam9g20ek modify dual slot evaluation kit at91sam9g20ek rev. C and onwards embed two SD/MMC slots. This patch modify the previous dual slot board definition to match the official rev. C board. It also allows the use of at91_mci SD/MMC driver in addition to the atmel-mci one. Some pins have been re-affected from leds or Ethernet phy IRQ to the SD/MMC slot A. This lead to a modification of those definitions. Signed-off-by: Nicolas Ferre Acked-by: Andrew Victor commit f534dc994397560343be4a3223b9bbaa8e739e1f Author: Suresh Jayaraman Date: Mon Nov 16 12:03:16 2009 +0530 cifs: clear server inode number flag while autodisabling Fix the commit ec06aedd44 that intended to turn off querying for server inode numbers when server doesn't consistently support inode numbers. Presumably the commit didn't actually clear the CIFS_MOUNT_SERVER_INUM flag, perhaps a typo. Signed-off-by: Suresh Jayaraman Acked-by: Jeff Layton Cc: Stable Signed-off-by: Steve French commit 80099c707e0915ac3159ddc70fb714adbb3d53e3 Author: Dan Carpenter Date: Mon Nov 16 11:05:03 2009 +0200 dereferencing freed memory regulator_fixed_voltage_remove() Don't dereference drvdata after it has been freed. regards, dan carpenter Signed-off-by: Dan Carpenter Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 0b4634fce1f3f7028421630260d54093276db490 Author: Dmitry Eremin-Solenikov Date: Mon Nov 16 01:48:32 2009 +0300 leds-gpio: fix possible crash on OF device unbinding If there are leds present in the OF tree, but the GPIOs for (some) of them are unavailable, led_data doesn't get populated with correct devices. Then, on device unbinding, one can crash the kernel. Workaround this by setting led->gpio to invalid value early. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Richard Purdie commit 716bdf1874647196ac16dd2a1ad359d88844795a Author: Pavel Machek Date: Fri Nov 6 15:58:31 2009 +0000 backlight: Fix backlight limiting on spitz/corgi devices On spitz (& similar) machines, if battery is running low, backlight needs to be limited to lower step. Unfortunately, current code uses &= for limiting, turning backlight off completely for some backlight settings. Fix that. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 1e0fa6bd8c7468067f2e988c7a416dafd0651c34 Author: Jean Delvare Date: Fri Oct 2 11:28:18 2009 +0200 backlight: lcd - Fix wrong sizeof Which is why I have always preferred sizeof(struct foo) over sizeof(var). Signed-off-by: Jean Delvare Signed-off-by: Richard Purdie commit 84d2a314bbe440d7c2e8636a1923aa3ea1aca51b Author: Jean Delvare Date: Mon Nov 16 12:45:40 2009 +0100 hwmon: (adt7475) Fix sysfs file names The adt7475 driver creates pwm#_auto_channel_temp attributes instead of the standard pwm#_auto_channels_temp. Fix it. Signed-off-by: Jean Delvare Acked-by: Hans de Goede Cc: Jordan Crouse commit 56e35eeebed2dcb4e1a17ad119e039cf095854ac Author: Jean Delvare Date: Mon Nov 16 12:45:40 2009 +0100 hwmon: (adt7475) Cache limits for 60 seconds The comment says that limits are cached for 60 seconds but the code actually caches them for only 2 seconds. Align the code on the comment, as 60 seconds makes more sense. Signed-off-by: Jean Delvare Acked-by: Hans de Goede Cc: Jordan Crouse commit cf312e077662ec3a07529551ab6e885828ccfb1d Author: Jean Delvare Date: Mon Nov 16 12:45:39 2009 +0100 hwmon: (adt7475) Fix temperature fault flags The logic of temperature fault flags is wrong, it shows faults when there are none and vice versa. Fix it. I can't believe this has been broken since the driver was added, 8 months ago, basically breaking temp1 and temp3, and nobody ever complained. Signed-off-by: Jean Delvare Acked-by: Hans de Goede Cc: Jordan Crouse commit be4c23c93c4828d36ac9e1a88410618a61676426 Author: Ben Dooks Date: Mon Nov 16 12:45:39 2009 +0100 hwmon: (s3c-hwmon) Ignore invalid divider settings Avoid registering channels that have zero divider settings in them, as this will only lead to kernel OOPS from divide-by-zero when the sysfs entry is read. Signed-off-by: Ben Dooks Signed-off-by: Jean Delvare commit 828d44536cd24dfc085a8cf5a12364972398dcd4 Merge: bf97402 8ef5837 Author: Takashi Iwai Date: Mon Nov 16 12:20:02 2009 +0100 Merge branch 'fix/hda' into for-linus commit 9a767d43fbddb3319dca568df49c48e0d1bb6bd8 Author: Roel Kluin Date: Fri Oct 16 14:16:15 2009 +0200 regulator: Fix check of unsigned return value and transmit errors in wm831x_gp_ldo_get_mode() If ret is unsigned, the checks for negative wm831x_reg_read() return values are wrong. The error value should be transmitted to its caller, e.g. wm831x_gp_ldo_get_status() which tests for a negative return value. Signed-off-by: Roel Kluin Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 60ef66fcf40f0e7bc9579981aa16bd8218942a83 Author: Mark Brown Date: Tue Oct 13 13:06:50 2009 +0100 regulator: Handle missing constraints in _regulator_disable() Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit bf97402052483c125a9ea7bf13df0dd9b4134078 Author: Dan Carpenter Date: Mon Nov 16 11:07:17 2009 +0200 ALSA: ice1724 - make some bitfields unsigned This is a clean up and doesn't change the behavior. Bit fields should always be unsigned. Otherwise pm_suspend_enabled will be -1 when you want it to be 1. The other bad thing is that the sparse checker will complain 36 times if they aren't unsigned. The other bitfields in that struct are unsigned already. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit 25583d4b5aa2c9aa5ed03ecc2ce73f3922714495 Author: Josh Triplett Date: Sun Nov 15 14:38:47 2009 -0800 Makefile: Add -Wmising-prototypes to HOSTCFLAGS Now that all host programs use static for all private functions and forward prototypes for all extern functions, add -Wmissing-prototypes to HOSTCFLAGS in the hopes of keeping it that way. All versions of GCC supported by the kernel handle -Wmissing-prototypes. Signed-off-by: Josh Triplett commit e8e63cbf9a339c972eeb5ccf8777c8067bdfd869 Author: Josh Triplett Date: Fri Oct 16 16:03:49 2009 -0700 oss: Mark loadhex static in hex2hex.c Nothing outside of hex2hex.c references loadhex. Signed-off-by: Josh Triplett commit 5ccd991548894f0b699f7d0137c31758a6948ddc Author: Josh Triplett Date: Fri Oct 16 15:53:55 2009 -0700 dtc: Mark various internal functions static Signed-off-by: Josh Triplett commit 23c4ace526fe9c5f9a4b1b0759cb76a285052ba0 Author: Josh Triplett Date: Fri Oct 16 15:52:06 2009 -0700 dtc: Set "noinput" in the lexer to avoid an unused function Regenerate the corresponding generated lexer. Regenerating the lexer with current flex also provides prototypes for various yy* functions, making some -Wmissing-prototypes warnings go away as well. Signed-off-by: Josh Triplett commit 0592e4c49e5af8ef71a1aa9308a100d711c64911 Author: Josh Triplett Date: Fri Oct 16 15:12:13 2009 -0700 drm: radeon: Mark several functions static in mkregtable Signed-off-by: Josh Triplett commit c843e315469a1519b83835628ca8906daf9a2c0a Author: Josh Triplett Date: Fri Oct 16 14:58:29 2009 -0700 arch/sparc/boot/*.c: Mark various internal functions static Signed-off-by: Josh Triplett commit 95981e7de53a7c67dc32d7440c160947c134d8eb Author: Josh Triplett Date: Fri Oct 16 14:52:05 2009 -0700 arch/powerpc/boot/addRamDisk.c: Mark several internal functions static Nothing outside of arch/powerpc/boot/addRamDisk.c references the functions "get4k", "put4k", or "death". Signed-off-by: Josh Triplett commit ad0cd62ab632afe9b562b5f09343c21e1521505d Author: Josh Triplett Date: Fri Oct 16 14:46:56 2009 -0700 arch/alpha/boot/tools/objstrip.c: Mark "usage" static Nothing outside of arch/alpha/boot/tools/objstrip.c references the usage function. Signed-off-by: Josh Triplett commit 1b98c00bf3a8a417be6412d8a3ed867a72b18f68 Author: Josh Triplett Date: Fri Oct 16 14:06:13 2009 -0700 Documentation/vm/page-types.c: Declare checked_open static Nothing outside of Documentation/vm/page-types.c references checked_open. Signed-off-by: Josh Triplett commit ed9df091491dd41d4e054071948c8e2e5b354c99 Author: Josh Triplett Date: Thu Oct 15 12:58:40 2009 -0700 genksyms: Mark is_reserved_word static The genksyms keyword gperf hash provides a function is_reserved_word. genksyms #includes the resulting generated file keywords.c, so the function gets used only in the same source file that defines it. Mark is_reserved_word static, and regenerate the corresponding generated file. Signed-off-by: Josh Triplett commit 65166571800af0f63f21e5576d7db12d2bf73790 Author: Josh Triplett Date: Thu Oct 15 12:13:36 2009 -0700 kconfig: Mark various internal functions static kconfig's keyword hash, lexer, and parser define various functions used only locally. Declare these functions as static, and regenerate the corresponding generated files. Signed-off-by: Josh Triplett commit 8ef5837a47f73faee18fa7ce2f9a9eb7675be8de Author: Daniel J Blueman Date: Sat Nov 14 18:20:04 2009 +0000 ALSA: hda - Dell Studio 1557 hd-audio quirk Add the Dell Studio 15 (model 1557, Core i7) laptop to the hd-audio quirk list, enabling audio. Signed-off-by: Daniel J Blueman Cc: Signed-off-by: Takashi Iwai commit 18dafac1a4c6c88867a50f9a82492976f20383d6 Author: Jiro SEKIBA Date: Sun Nov 15 13:49:45 2009 +0900 nilfs2: deleted inconsistent comment in nilfs_load_inode_block() The comment says, "Caller of this function MUST lock s_inode_lock", however just above the comment, it locks s_inode_lock in the function. Signed-off-by: Jiro SEKIBA Signed-off-by: Ryusuke Konishi commit 1a7af63108f07637504300671a72432c34e10021 Author: Jiro SEKIBA Date: Sun Nov 15 13:49:44 2009 +0900 nilfs2: deleted struct nilfs_dat_group_desc struct nilfs_dat_group_desc is not used both in kernel and user spaces. struct nilfs_palloc_group_desc is used instead. Signed-off-by: Jiro SEKIBA Signed-off-by: Ryusuke Konishi commit a9366e61b03f55a6e009e687ad10e706714c9907 Merge: 24dfb2b 99dcade Author: Linus Torvalds Date: Sat Nov 14 13:05:27 2009 -0800 Merge git://git.infradead.org/users/dwmw2/iommu-2.6.32 * git://git.infradead.org/users/dwmw2/iommu-2.6.32: intel-iommu: Support PCIe hot-plug intel-iommu: Obey coherent_dma_mask for alloc_coherent on passthrough intel-iommu: Check for 'DMAR at zero' BIOS error earlier. commit 24dfb2b5867df24ba03b6c4418312e23b1300aa8 Merge: cd4ca27 5df9d11 Author: Linus Torvalds Date: Sat Nov 14 13:03:24 2009 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: SMTC: Fix lockup in smtc_distribute_timer MIPS: TXx9: Update rbtx49xx_defconfig MIPS: Make local arrays with CL_SIZE static __initdata MIPS: Add DMA declare coherent memory support MIPS: Fix emulation of 64-bit FPU on FPU-less 64-bit CPUs. commit cd4ca27d3dedfff09000586e4ae67771608696a0 Merge: 0e70613 3d4c3aa Author: Linus Torvalds Date: Sat Nov 14 13:00:17 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: psmouse - remove unneeded '\n' from psmouse.proto parameter Input: atkbd - restore LED state at reconnect Input: force LED reset on resume Input: fix locking in memoryless force-feedback devices commit 0e70613b1c26bf23909d0e778de52d0cc6d88835 Merge: e0a2af1 c148ffd Author: Linus Torvalds Date: Sat Nov 14 12:59:32 2009 -0800 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md/raid5: Allow dirty-degraded arrays to be assembled when only party is degraded. Don't unconditionally set in_sync on newly added device in raid5_reshape md: allow v0.91 metadata to record devices as being active but not in-sync. md: factor out updating of 'recovery_offset'. commit e0a2af1e60ae89b18ef3afbf655f096564751045 Merge: 0283243 833af84 Author: Linus Torvalds Date: Sat Nov 14 12:59:06 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: restructure pcpu_extend_area_map() to fix bugs and improve readability commit 0283243849e88f864a059783b29346cbf1e0b8e8 Merge: 7b8e2c1 bcc6525 Author: Linus Torvalds Date: Sat Nov 14 12:57:39 2009 -0800 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] s390: fix single stepping on svc0 [S390] sclp: undo quiesce handler override on resume [S390] reset cputime accounting after IPL from NSS [S390] monreader: fix use after free bug with suspend/resume commit 7b8e2c1db0f358bc389dd1ee4633a92d80a5a6d0 Author: Oliver Neukum Date: Fri Nov 13 14:26:23 2009 +0100 fix memory leak in fixed btusb_close If the waker is killed before it can replay outstanding URBs, these URBs won't be freed or will be replayed at the next open. This patch closes the window by explicitely discarding outstanding URBs. Signed-off-by: Oliver Neukum Acked-by: Marcel Holtmann Signed-off-by: Linus Torvalds commit 479c2553af9a176a0613894b9f1ec73425fd56a3 Author: Petr Vandrovec Date: Sat Nov 14 10:47:07 2009 +0100 Fix memory corruption caused by nfsd readdir+ Commit 8177e6d6dfb9cd03d9bdeb647c32161f8f58f686 ("nfsd: clean up readdirplus encoding") introduced single character typo in nfs3 readdir+ implementation. Unfortunately that typo has quite bad side effects: random memory corruption, followed (on my box) with immediate spontaneous box reboot. Using 'p1' instead of 'p' fixes my Linux box rebooting whenever VMware ESXi box tries to list contents of my home directory. Signed-off-by: Petr Vandrovec Cc: "J. Bruce Fields" Cc: Neil Brown Signed-off-by: Linus Torvalds commit 5e08fe570c2dbabb5015c37049eb9a451e55c890 Author: Takashi Iwai Date: Sat Nov 14 14:37:19 2009 +0100 ALSA: ice1724 - Fix section mismatch in prodigy_hd2_resume() Remove invlid __devinit prefix from the suspend callback. Signed-off-by: Takashi Iwai commit 2bf30108435339c4cf149f9d279d0dc961345393 Author: Lennert Buytenhek Date: Thu Nov 12 20:31:14 2009 +0100 [ARM] Kirkwood: disable propagation of mbus error to the CPU local bus Disable propagation of mbus errors to the CPU local bus, as this causes mbus errors (which can occur for example for PCI aborts) to throw CPU aborts, which we're not set up to deal with. Reported-by: Dieter Kiermaier Signed-off-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit 5df9d11be46a9f704208644a1e7f13c6104ecff2 Author: Kevin D. Kissell Date: Tue Nov 10 11:45:46 2009 -0800 MIPS: SMTC: Fix lockup in smtc_distribute_timer 1. At the end of smtc_distribute_timer, nextstamp is valid and has already passed so we goto repeat. 2. Nothing updates nextstamp (only updated if the timeout is in the future And we just decided it is in the past) 3. At the end nextstamp still has the same value so it is still valid and in the past. 4. This repeats until read_c0_count has a value which causes nextstamp to be in the future. Reported and initial patch and testing by Mikael Starvik . Signed-off-by: Kevin D. Kissell Cc: Mikael Starvik Cc: linux-mips@linux-mips.org Cc: Jesper Nilsson Patchwork: http://patchwork.linux-mips.org/patch/621/ Signed-off-by: Ralf Baechle commit 1b12a9c87792550a3d7f5f39eb529c822b911b17 Author: Atsushi Nemoto Date: Wed Nov 11 21:38:46 2009 +0900 MIPS: TXx9: Update rbtx49xx_defconfig Enable following features: * MTD (RBTX4939, NAND_TXX9NDFMC) * HW_RANDOM (HW_RANDOM_TX4939) * SOUND (SND_SOC_TXX9ACLC) * DMADEVICE (TXX9_DMAC) Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit c4304529543114a5df7eeec31ec5ee5c7c924738 Author: Atsushi Nemoto Date: Sun Nov 8 02:20:37 2009 +0900 MIPS: Make local arrays with CL_SIZE static __initdata Since commit 22242681cff52bfb7cba5d2a37b91802be7a4e4c ("MIPS: Extend COMMAND_LINE_SIZE"), CL_SIZE is 4096 and local array variables with this size will cause an build failure with default CONFIG_FRAME_WARN settings. Although current users of such array variables are all early bootstrap code and not likely to cause real stack overflow (thread_info corruption), it is preferable to to declare these arrays static with __initdata. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f8ac04255dc8baa1c018e8028222d842efa56e6b Author: Yoichi Yuasa Date: Thu Jun 4 00:16:04 2009 +0900 MIPS: Add DMA declare coherent memory support The ohci-sm501 driver requires dma_declare_coherent_memory(). It is used by the driver's local memory allocation with dma_alloc_coherent(). Tested on TANBAC TB0287(VR4131 + SM501). [Ralf: Fixed reject in dma-default.c and removed the entire #if 0'ed block in dma-mapping.h instead of just the #if 0.] Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit da0bac33413b2888d3623dad3ad19ce76b688f07 Author: David Daney Date: Mon Nov 2 11:33:46 2009 -0800 MIPS: Fix emulation of 64-bit FPU on FPU-less 64-bit CPUs. Running a 64-bit kernel on a 64-bit CPU without an FPU would cause the emulator to run in 32-bit mode. The c0_Status.FR bit is wired to zero on systems without an FPU, so using that bit to decide how the emulator behaves doesn't allow for proper emulation on 64-bit FPU-less processors. Instead, we need to select the emulator mode based on the user-space ABI. Since the thread flag TIF_32BIT_REGS is used to set c0_Status.FR, we can just use it to decide if the emulator should be in 32-bit or 64-bit mode. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit bcc6525fb23d2cec7ffdf908d98826a66823bcb2 Author: Christian Borntraeger Date: Fri Nov 13 15:43:54 2009 +0100 [S390] s390: fix single stepping on svc0 On s390 there are two ways of specifying the system call number for the svc instruction. The standard way is to use the immediate field in the instruction (or to use EXecute for values unknown during assemble time). This can encode 256 system calls. The kernel ABI also allows to put the system call number in r1 and then execute svc 0 to enable system call numbers > 255. It turns out that single stepping svc 0 is broken, since the PER program check handler uses r1. We have to use a different register. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 8b94c1ed4d8232a452aa9db0f5ac9141d942590f Author: Martin Schwidefsky Date: Fri Nov 13 15:43:53 2009 +0100 [S390] sclp: undo quiesce handler override on resume In a system where the ctrl-alt-del init action initiated by signal quiesce suspends the machine the quiesce handler override for _machine_restart, _machine_halt and _machine_power_off needs to be undone, otherwise the override is still present in the resumed system. The next shutdown would then load the quiesce state psw instead of performing the correct shutdown action. Signed-off-by: Martin Schwidefsky commit b89031e087a47819be48028e62cebade5f9fb75b Author: Martin Schwidefsky Date: Fri Nov 13 15:43:52 2009 +0100 [S390] reset cputime accounting after IPL from NSS After an IPL from NSS the uptime of the system is incorrect. The reason is that the startup code in head.S is not executed in case of an IPL from NSS. Due to that sched_clock_base_cc which is used to initialze wall_to_monotonic contains the time stamp when the NSS has been created instead of the time stamp of the system start. Reinitialize the cputime accounting values in create_kernel_nss after the SAVESYS CP command that created the NSS segment. Signed-off-by: Martin Schwidefsky commit ccaf6553963bc6304d5820962a08a4397d0a2dc2 Author: Gerald Schaefer Date: Fri Nov 13 15:43:51 2009 +0100 [S390] monreader: fix use after free bug with suspend/resume The monreader device driver doesn't set dev->driver_data to NULL after freeing the corresponding data structure. This leads to a use after free bug in the freeze/thaw suspend/resume functions after the device has been opened and closed once. Fix this by clearing dev->driver_data in the close() function. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 9da4ea69f28cf2bd20be86eda34afbc03c2180c7 Author: Eric Miao Date: Fri Nov 13 16:44:14 2009 +0800 [ARM] pxa: fix incorrect mfp_to_gpio() conversion Since MFP_PIN_GPIO* now includes 128-255, mfp_to_gpio() is no longer valid for those additional pins, fix it. Signed-off-by: Eric Miao commit 15f593cfcb1178f832aaf9ec0200acd8c3c3348c Author: Marek Vasut Date: Sun Nov 8 03:05:11 2009 +0100 [ARM] pxa/colibri: fix AC97 ifdefs and add missing include The AC97 part wasn't initialized on Colibri/PXA320 because the macros were wrong. Also, the code didn't compile because of a header file not being included. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 2b5e080ae946b4a346b842a73d80f319b7a6453c Author: Roel Kluin Date: Wed Oct 21 13:25:50 2009 +0200 [ARM] pxa: fix missing underscores in mfp-pxa910.h Underscores were missing. Signed-off-by: Roel Kluin Signed-off-by: Eric Miao commit b2b36316626f0d6b92c3675a2aa2726efc71d146 Author: Marc Zyngier Date: Thu Nov 5 08:10:10 2009 +0100 [ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa: initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on pxa27x/3xx. In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0). Tested on an Arcom Zeus (pxa270), with both CONFIG_PXA_HAVE_ISA_IRQS enabled and disabled. Signed-off-by: Marc Zyngier Tested-by: Haojian Zhuang Signed-off-by: Eric Miao commit 3d4c3aa938fcbfee1c7a6d66ee23288448fb97e7 Author: Takashi Iwai Date: Thu Nov 12 23:30:52 2009 -0800 Input: psmouse - remove unneeded '\n' from psmouse.proto parameter The get parameter function should return a string without a life-feed. Otherwise you'll see additional empty line in sysfs parameters file. Signed-off-by: Takashi Iwai Signed-off-by: Dmitry Torokhov commit e2e527ae7fb07caa58f8fa8fa7e90ada0b175dd7 Author: Takashi Iwai Date: Fri Nov 13 08:28:03 2009 +0100 ALSA: hda - Add another Nvidia HDMI codec id (10de:0005) Found on Nvidia 9800M GTS. Reported-by: Chris Balcum Signed-off-by: Takashi Iwai commit d4119bdacfcd88a763e250fe0efa6a2e11d30e88 Author: Dmitry Torokhov Date: Thu Nov 12 23:19:05 2009 -0800 Input: atkbd - restore LED state at reconnect Even though input core tells us to restore LED state and repeat rate at resume keyboard may be reconnected either by request from userspace (via sysfs) or just by pulling it from the box and plugging it back in. In these cases we still need to restore state ourselves. Signed-off-by: Dmitry Torokhov commit 3cc96351799d3d82c3809aa6970ef537bc1af553 Author: Dmitry Torokhov Date: Thu Nov 12 23:19:05 2009 -0800 Input: force LED reset on resume We should be sending EV_LED event down to drivers upon resume even in cases when in-kernel state of the LED is off since device could come up with some leds turned on. Reported-and-tested-by: Mikko Vinni Signed-off-by: Dmitry Torokhov commit c148ffdcda00b6599b70f8b65e6a1fadd1dbb127 Author: NeilBrown Date: Fri Nov 13 17:47:00 2009 +1100 md/raid5: Allow dirty-degraded arrays to be assembled when only party is degraded. Normally is it not safe to allow a raid5 that is both dirty and degraded to be assembled without explicit request from that admin, as it can cause hidden data corruption. This is because 'dirty' means that the parity cannot be trusted, and 'degraded' means that the parity needs to be used. However, if the device that is missing contains only parity, then there is no issue and assembly can continue. This particularly applies when a RAID5 is being converted to a RAID6 and there is an unclean shutdown while the conversion is happening. So check for whether the degraded space only contains parity, and in that case, allow the assembly. Signed-off-by: NeilBrown commit 7ef90146a14c2bb1de2e22399f147ebec5b74f0b Author: NeilBrown Date: Fri Nov 13 17:40:51 2009 +1100 Don't unconditionally set in_sync on newly added device in raid5_reshape When a reshape finds that it can add spare devices into the array, those devices might already be 'in_sync' if they are beyond the old size of the array, or they might not if they are within the array. The first case happens when we change an N-drive RAID5 to an N+1-drive RAID5. The second happens when we convert an N-drive RAID5 to an N+1-drive RAID6. So set the flag more carefully. Also, ->recovery_offset is only meaningful when the flag is clear, so only set it in that case. This change needs the preceding two to ensure that the non-in_sync device doesn't get evicted from the array when it is stopped, in the case where v0.90 metadata is used. Signed-off-by: NeilBrown commit 0261cd9f1cb42fa44ece314d27868d83742bdf03 Author: NeilBrown Date: Fri Nov 13 17:40:48 2009 +1100 md: allow v0.91 metadata to record devices as being active but not in-sync. This is a combination that didn't really make sense before. However when a reshape is converting e.g. raid5 -> raid6, the extra device is not fully in-sync, but is certainly active and contains important data. So allow that start to be meaningful and in particular get the 'recovery_offset' value (which is needed for any non-in-sync active device) from the reshape_position. Signed-off-by: NeilBrown commit c1ea985c710f41e97f1c72c29bbf367375370f0b Author: Ryusuke Konishi Date: Thu Nov 12 00:13:32 2009 +0900 nilfs2: fix lock order reversal in chcp operation Will fix the following lock order reversal lockdep detected: ======================================================= [ INFO: possible circular locking dependency detected ] 2.6.32-rc6 #7 ------------------------------------------------------- chcp/30157 is trying to acquire lock: (&nilfs->ns_mount_mutex){+.+.+.}, at: [] nilfs_cpfile_change_cpmode+0x46/0x752 [nilfs2] but task is already holding lock: (&nilfs->ns_segctor_sem){++++.+}, at: [] nilfs_transaction_begin+0xba/0x110 [nilfs2] which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #2 (&nilfs->ns_segctor_sem){++++.+}: [] __lock_acquire+0x109c/0x139d [] lock_acquire+0x89/0xa0 [] down_read+0x31/0x45 [] nilfs_attach_checkpoint+0x8f/0x16b [nilfs2] [] nilfs_get_sb+0x3e7/0x653 [nilfs2] [] vfs_kern_mount+0x8b/0x124 [] do_kern_mount+0x37/0xc3 [] do_mount+0x64d/0x69d [] sys_mount+0x66/0x95 [] sysenter_do_call+0x12/0x32 -> #1 (&type->s_umount_key#31/1){+.+.+.}: [] __lock_acquire+0x109c/0x139d [] lock_acquire+0x89/0xa0 [] down_write_nested+0x34/0x52 [] sget+0x22e/0x389 [] nilfs_get_sb+0x187/0x653 [nilfs2] [] vfs_kern_mount+0x8b/0x124 [] do_kern_mount+0x37/0xc3 [] do_mount+0x64d/0x69d [] sys_mount+0x66/0x95 [] sysenter_do_call+0x12/0x32 -> #0 (&nilfs->ns_mount_mutex){+.+.+.}: [] __lock_acquire+0xe27/0x139d [] lock_acquire+0x89/0xa0 [] mutex_lock_nested+0x41/0x23e [] nilfs_cpfile_change_cpmode+0x46/0x752 [nilfs2] [] nilfs_ioctl+0x11a/0x7da [nilfs2] [] vfs_ioctl+0x27/0x6e [] do_vfs_ioctl+0x491/0x4db [] sys_ioctl+0x45/0x5f [] sysenter_do_call+0x12/0x32 Signed-off-by: Ryusuke Konishi commit 833af8427be4b217b5bc522f61afdbd3f1d282c2 Author: Tejun Heo Date: Wed Nov 11 15:35:18 2009 +0900 percpu: restructure pcpu_extend_area_map() to fix bugs and improve readability pcpu_extend_area_map() had the following two bugs. * It should return 1 if pcpu_lock was dropped and reacquired but it returned 0. This could lead to oops if free_percpu() races with area map extension. * pcpu_mem_free() was called under pcpu_lock. pcpu_mem_free() might end up calling vfree() which isn't IRQ safe. This could lead to deadlock through lock order inversion via IRQ. In addition, Linus pointed out that the temporary lock dropping and subtle three-way return value of pcpu_extend_area_map() was very ugly and suggested to split the function into two - pcpu_need_to_extend() and pcpu_extend_area_map(). This patch restructures pcpu_extend_area_map() as suggested and fixes the two bugs. Signed-off-by: Tejun Heo Acked-by: Linus Torvalds Cc: Ingo Molnar commit 46ef6ec9da420b298b1f197e445bf5b06fe01ef4 Author: Daniel T Chen Date: Wed Nov 11 14:32:10 2009 -0500 ALSA: hda: Use model=mb5 for MacBookPro 5,2 BugLink: https://bugs.launchpad.net/bugs/462098 Until we can look closer at the verbs, let's use ALC885_MB5 for codec SSID 0x106b4600 to enable playback and capture for MacBookPro 5,2s. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 99dcadede42f8898d4c963ef69192ef4b9b76ba8 Author: Fenghua Yu Date: Wed Nov 11 07:23:06 2009 -0800 intel-iommu: Support PCIe hot-plug To support PCIe hot plug in IOMMU, we register a notifier to respond to device change action. When the notifier gets BUS_NOTIFY_UNBOUND_DRIVER, it removes the device from its DMAR domain. A hot added device will be added into an IOMMU domain when it first does IOMMU op. So there is no need to add more code for hot add. Without the patch, after a hot-remove, a hot-added device on the same slot will not work. Signed-off-by: Fenghua Yu Tested-by: Yinghai Lu Signed-off-by: David Woodhouse commit e8bb910d1bbc65e7081e73aab4b3a3dd8630332c Author: Alex Williamson Date: Wed Nov 4 15:59:34 2009 -0700 intel-iommu: Obey coherent_dma_mask for alloc_coherent on passthrough The model for IOMMU passthrough is that decent devices that can cope with DMA to all of memory get passthrough; crappy devices with a limited dma_mask don't -- they get to use the IOMMU anyway. This is done on the basis that IOMMU passthrough is usually wanted for performance reasons, and it's only the decent PCI devices that you really care about performance for, while the crappy 32-bit ones like your USB controller can just use the IOMMU and you won't really care. Unfortunately, the check for this was only looking at dev->dma_mask, not at dev->coherent_dma_mask. And some devices have a 32-bit coherent_dma_mask even though they have a full 64-bit dma_mask. Even more unfortunately, fixing that simple oversight would upset certain broken HP devices. Not only do they have a 32-bit coherent_dma_mask, but they also have a tendency to do stray DMA to unmapped addresses. And then they die when they take the DMA fault they so richly deserve. So if we do the 'correct' fix, it'll mean that affected users have to disable IOMMU support completely on "a large percentage of servers from a major vendor." Personally, I have little sympathy -- given that this is the _same_ 'major vendor' who is shipping machines which claim to have IOMMU support but have obviously never _once_ booted a VT-d capable OS to do any form of QA. But strictly speaking, it _would_ be a regression even though it only ever worked by fluke. For 2.6.33, we'll come up with a quirk which gives swiotlb support for this particular device, and other devices with an inadequate coherent_dma_mask will just get normal IOMMU mapping. The simplest fix for 2.6.32, though, is just to jump through some hoops to try to allocate coherent DMA memory for such devices in a place that they can reach. We'd use dma_generic_alloc_coherent() for this if it existed on IA64. Signed-off-by: Alex Williamson Signed-off-by: David Woodhouse commit 5e8651060cea6b44844521ddcac665e2c021f5d8 Author: NeilBrown Date: Thu Nov 12 12:08:04 2009 +1100 md: factor out updating of 'recovery_offset'. Each device has its own 'recovery_offset' showing how far recovery has progressed on the device. As the only real significance of this is that fact that it can be stored in the metadata and recovered at restart, and as only 1.x metadata can do this, we were only updating 'recovery_offset' to 'curr_resync_completed' when updating v1.x metadata. But this is wrong, and we will shortly make limited use of this field in v0.90 metadata. So move the update into common code. Signed-off-by: NeilBrown commit bf3204cbff7d2606e758afb0994e8da6ae1c6c26 Author: Dmitry Torokhov Date: Fri Nov 6 21:39:07 2009 -0800 Input: fix locking in memoryless force-feedback devices Now that input core acquires dev->event_lock spinlock and disables interrupts when propagating input events, using spin_lock_bh() in ff-memless driver is not allowed. Actually, the timer_lock itself is not needed anymore, we should simply use dev->event_lock as well. Also do a small cleanup in force-feedback core. Reported-by: kerneloops.org Reported-by: http://www.kerneloops.org/searchweek.php?search=ml_ff_set_gain Reported-by: Arjan van de Ven Signed-off-by: Dmitry Torokhov commit 86cf898e1d0fca245173980e3897580db38569a8 Author: David Woodhouse Date: Mon Nov 9 22:15:15 2009 +0000 intel-iommu: Check for 'DMAR at zero' BIOS error earlier. Chris Wright has some patches which let us fall back to swiotlb nicely if IOMMU initialisation fails. But those are a bit much for 2.6.32. Instead, let's shift the check for the biggest problem, the HP and Acer BIOS bug which reports a DMAR at physical address zero. That one can actually be checked much earlier -- before we even admit to having detected an IOMMU in the first place. So the swiotlb init goes ahead as we want. Signed-off-by: David Woodhouse commit 1456edbb1476db735715ddcc7ac306de587024eb Author: Josh Triplett Date: Thu Oct 15 11:03:20 2009 -0700 kconfig: Make zconf.y work with current bison zconf.y includes zconf.hash.c from the initial code section. zconf.hash.c references the token constants from zconf.y. However, current bison defines the token constants after the initial code section, making zconf.hash.c fail to compile. Move the include of zconf.hash.c later in zconf.y, so bison puts it after the token constants. Signed-off-by: Josh Triplett