summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove user-visible references to PAGE_SIZE in include/asm-powerpc/elf.hDavid Woodhouse2006-04-251-4/+3
| | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stableLinus Torvalds2006-04-251-1/+4
|\ | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable: [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined
| * [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefinedSteve French2006-04-241-1/+4
| | | | | | | | | | Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
* | [NETFILTER]: ipt action: use xt_check_target for basic verificationPatrick McHardy2006-04-251-0/+5
| | | | | | | | | | | | | | | | The targets don't do the basic verification themselves anymore so the ipt action needs to take care of it. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [NETFILTER]: x_tables: move table->lock initializationDmitry Mishin2006-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | xt_table->lock should be initialized before xt_replace_table() call, which uses it. This patch removes strict requirement that table should define lock before registering. Signed-off-by: Dmitry Mishin <dim@openvz.org> Signed-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [NETFILTER]: ip6_tables: remove broken comefrom debuggingPatrick McHardy2006-04-251-13/+0
| | | | | | | | | | | | | | | | The introduction of x_tables broke comefrom debugging, remove it from ip6_tables as well (ip_tables already got removed). Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [NETFILTER]: nf_conntrack: kill unused callback init_conntrackYasuyuki Kozakai2006-04-251-3/+0
| | | | | | | | | | | | Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [NETFILTER]: Fix compat_xt_counters alignment for non-x86Patrick McHardy2006-04-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | Some (?) non-x86 architectures require 8byte alignment for u_int64_t even when compiled for 32bit, using u_int32_t in compat_xt_counters breaks on these architectures, use u_int64_t for everything but x86. Reported by Andreas Schwab <schwab@suse.de>. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [NETFILTER]: ULOG target is not obsoleteThomas Voegtle2006-04-251-1/+1
| | | | | | | | | | | | | | | | The backend part is obsoleted, but the target itself is still needed. Signed-off-by: Thomas Voegtle <tv@lio96.de> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [NETFILTER]: nf_conntrack: Fix module refcount dropping too farYasuyuki Kozakai2006-04-252-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If nf_ct_l3proto_find_get() fails to get the refcount of nf_ct_l3proto_generic, nf_ct_l3proto_put() will drop the refcount too far. This gets rid of '.me = THIS_MODULE' of nf_ct_l3proto_generic so that nf_ct_l3proto_find_get() doesn't try to get refcount of it. It's OK because its symbol is usable until nf_conntrack.ko is unloaded. This also kills unnecessary NULL pointer check as well. __nf_ct_proto_find() allways returns non-NULL pointer. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SPARC]: __NR_sys removalOGAWA Hirofumi2006-04-242-2/+2
|/ | | | | | | | __NR_sys_sync_file_range part was lost somewhere... [glibc is already checking __NR_sync_file_range] Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds2006-04-2326-465/+735
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: [PARISC] MAINTAINERS [PARISC] Make ioremap default to _nocache [PARISC] Add new entries to the syscall table [PARISC] Further work for multiple page sizes [PARISC] Fix up hil_kbd.c mismerge [PARISC] defconfig updates [PARISC] Document that we tolerate "Relaxed Ordering" [PARISC] Misc. janitorial work [PARISC] EISA regions must be mapped NO_CACHE [PARISC] OSS ad1889: Match register names with ALSA driver
| * [PARISC] MAINTAINERSKyle McMartin2006-04-221-0/+4
| | | | | | | | | | | | | | Add myself to maintainers and add the parisc trees. Acked-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Make ioremap default to _nocacheKyle McMartin2006-04-221-12/+5
| | | | | | | | | | | | | | | | Since it is way more work to change most drivers to comply with parisc, take the easy way out and make ioremap _NO_CACHE by default. This is in line with what powerpc does. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Add new entries to the syscall tableKyle McMartin2006-04-223-2/+22
| | | | | | | | | | | | | | Most are easy, but sync_file_range needed special handling when entering through the 32-bit syscall table. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Further work for multiple page sizesHelge Deller2006-04-2211-102/+198
| | | | | | | | | | | | | | | | | | | | More work towards supporing multiple page sizes on 64-bit. Convert some assumptions that 64bit uses 3 level page tables into testing PT_NLEVELS. Also some BUG() to BUG_ON() conversions and some cleanups to assembler. Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Fix up hil_kbd.c mismergeMatthew Wilcox2006-04-221-1/+1
| | | | | | | | | | Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] defconfig updatesHelge Deller2006-04-221-179/+315
| | | | | | | | | | | | | | | | | | Make the defconfig more generally useful. Turn on IPv6, modules, cardbus, etc. Boots 32bit on 715 with HIL, B160L with sound, PrecisionBook, and C3000. Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Document that we tolerate "Relaxed Ordering"Grant Grundler2006-04-221-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | This means "DMA Read returns" can bypass "MMIO Writes". Violating the PCI specs in this case improves outbound DMA "flows" and is currently not required by any drivers. This is NOT a new behavior. Previous chipsets did this already and I believe ZX1 PDC was already setting this for hpux. I just want to further document the behavior. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Misc. janitorial workHelge Deller2006-04-224-6/+6
| | | | | | | | | | | | | | | | Fix a spelling mistake, add a KERN_INFO flag, and fix some whitespace uglies. Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] EISA regions must be mapped NO_CACHEHelge Deller2006-04-221-1/+2
| | | | | | | | | | Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] OSS ad1889: Match register names with ALSA driverStuart Brady2006-04-222-149/+150
| | | | | | | | | | Signed-off-by: Stuart Brady <sdb@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2006-04-234-17/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards [PATCH] vrc4171: update config [PATCH] pcmcia: fix oops in static mapping case [PATCH] pcmcia: remove unneeded forward declarations [PATCH] pcmcia: do not set dev_node to NULL too early [PATCH] pcmcia: fix comment for pcmcia_load_firmware [PATCH] pcmcia: unload second device first [PATCH] pcmcia: add new ID to pcnet_cs
| * | [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cardsDaniel Ritz2006-04-221-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the old ioctl interface together with cardbus card gives a NULL pointer dereference since cardbus devices don't have a struct pcmcia_device. also s->io[0].res can be NULL as well. Fix is to move the pcmcia code after the cardbus code and to check for a null pointer. Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] vrc4171: update configYoichi Yuasa2006-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch updates "depends on" for PCMCIA_VRC4171. CONFIG_VRC4171 has been removed, so replace it with CPU_VR41XX && ISA. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: fix oops in static mapping caseDominik Brodowski2006-04-221-1/+0
| | | | | | | | | | | | | | | | | | | | | As static maps do not have IO resources, this setting oopses. However, as we do not ever read this value, we can safely remove it. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: remove unneeded forward declarationsAndrew Morton2006-04-221-6/+2
| | | | | | | | | | | | | | | | | | | | | Also remove a couple of unneeded typecasts. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: do not set dev_node to NULL too earlyDominik Brodowski2006-04-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If we set dev_node to NULL too early, some drivers which used this to determine whether unregister_netdev() needs to be called fail when removing a PCMCIA card. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: fix comment for pcmcia_load_firmwareKomuro2006-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The comment of "pcmcia_load_firmware" is wrong: the firmware(*.cis) files reside in /lib/firmware/ _not_ /lib/firmware/cis/ . Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: unload second device firstKomuro2006-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use list_add instead of list_add_tail for pcmcia_device_add so that second device of multi-function-card will be unloaded first. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: add new ID to pcnet_csDominik Brodowski2006-04-221-0/+1
| |/ | | | | | | | | | | This adds a new ID to pcnet_cs, as noted by Kuro Moji. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | Merge branch 'drm-patches' of ↵Linus Torvalds2006-04-235-10/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: possible cleanups drm: fixup r300 scratch on BE machines
| * | drm: possible cleanupsDave Airlie2006-04-234-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the following possible cleanups: - make the following needlessly global function static: - drm_bufs.c: drm_addbufs_fb() - remove the following unused EXPORT_SYMBOL's: - drm_agpsupport.c: drm_agp_bind_memory - drm_bufs.c: drm_rmmap_locked - drm_bufs.c: drm_rmmap - drm_stub.c: drm_get_dev Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fixup r300 scratch on BE machinesDave Airlie2006-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | This fixes the r300 scratch stuff to work on PPC, from Ben Herrenschmidt on IRC. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stableLinus Torvalds2006-04-2313-115/+138
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable: [CIFS] Fix typo in previous [CIFS] Readdir fixes to allow search to start at arbitrary position [CIFS] Use the kthread_ API instead of opencoding lots of hairy code for kernel [CIFS] Don't allow a backslash in a path component [CIFS] [CIFS] Do not take rename sem on most path based calls (during
| * | | [CIFS] Fix typo in previousSteve French2006-04-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | [CIFS] Readdir fixes to allow search to start at arbitrary positionSteve French2006-04-227-36/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in directory Also includes first part of fix to compensate for servers which forget to return . and .. as well as updates to changelog and cifs readme. Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | [CIFS] Use the kthread_ API instead of opencoding lots of hairy code for kernelSteve French2006-04-221-49/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread creation and teardown. It does not move the cifsd thread handling to kthread due to problems found in testing with wakeup of threads blocked in the socket peek api, but the other cifs kernel threads now use kthread. Also cleanup cifs_init to properly unwind when thread creation fails. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | [CIFS] Don't allow a backslash in a path componentSteve French2006-04-211-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless Posix paths have been negotiated, the backslash, "\", is not a valid character in a path component. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | [CIFS] [CIFS] Do not take rename sem on most path based calls (duringSteve French2006-04-217-30/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | building of full path) to avoid hang rename/readdir hang Reported by Alan Tyson Signed-off-by: Steve French <sfrench@us.ibm.com>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2006-04-2321-169/+231
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge: powerpc: Fix define_machine so machine_is() works from modules powerpc/ppc: export strncasecmp [PATCH] powerpc: fix oops in alsa powermac driver [PATCH] powerpc: update {g5,iseries,pseries}_defconfigs [PATCH] ppc: Fix powersave code on arch/ppc [PATCH] powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_table [PATCH] powermac: Fix i2c on keywest based chips [PATCH] powerpc: Lower threshold for DART enablement to 1GB [PATCH] powerpc: IOMMU support for honoring dma_mask
| * | | powerpc: Fix define_machine so machine_is() works from modulesPaul Mackerras2006-04-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | machine_is() was always returning 0 when used in a module, because we weren't exporting the machine definitions. This was why sound wasn't working on powermacs when CONFIG_SND_POWERMAC=m. Original fix from Ben Herrenschmidt, further fixed by me. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | Merge branch 'misc' of ↵Paul Mackerras2006-04-222-0/+2
| |\ \ \ | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
| | * \ \ Merge branch 'master'Kumar Gala2006-04-04556-9326/+48607
| | |\ \ \
| | * | | | powerpc/ppc: export strncasecmpKumar Gala2006-04-022-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a strncasecmp so we might as well export it Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | | | [PATCH] powerpc: fix oops in alsa powermac driverBenjamin Herrenschmidt2006-04-214-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an oops in 2.6.16.X when loading the snd_powermac module. The name of the requested module changed during the 2.6.16 development cycle from i2c-keylargo to i2c-powermac. Signed-off-by: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | | | [PATCH] powerpc: update {g5,iseries,pseries}_defconfigsWill Schmidt2006-04-213-76/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default choices for all. Signed-off-by: Will Schmidt <willschm@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | | | [PATCH] ppc: Fix powersave code on arch/ppcBecky Bruce2006-04-212-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix asm_offsets.c and entry.S to work with the new power save code. Changes in arch/powerpc needed to exist in arch/ppc as well since the idle code is shared by both ppc and powerpc.. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | | | [PATCH] powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_tableArnd Bergmann2006-04-212-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time a new syscall gets added, a BUILD_BUG_ON in arch/powerpc/platforms/cell/spu_callbacks.c gets triggered. Since the addition of a new syscall is rather harmless, the error should just be removed. While we're here, add sys_tee to the list and add a comment to systbl.S to remind people that there is another list on powerpc. Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | | | [PATCH] powermac: Fix i2c on keywest based chipsBenjamin Herrenschmidt2006-04-211-43/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new i2c implementation for PowerMac has a regression that causes the hardware to go out of state when probing non-existent devices. While fixing that, I also found & fixed a couple of other corner cases. This fixes booting with a pbbuttons version that scans the i2c bus for an LMU controller among others. Tested on a dual G5 with thermal control (which has heavy i2c activity) with no problem so far. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 19:36:44 +0100