summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* kbuild: In setlocalversion change -git_dirty to just -dirtyRyan Anderson2006-01-081-1/+1
| | | | | | | | | When building Debian packages directly from the git tree, the appended "git_dirty" is a problem due to the underscore. In order to cause the least problems, change that just to "dirty". Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* modpost/file2alias: Fix typoBrian Gerst2006-01-081-1/+1
| | | | | | | SND_MAX should be FF_MAX Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* kbuild: clean up asm-offsets.h creationBrian Gerst2006-01-081-3/+2
| | | | | | | | - Move mkdir out of cmd_offsets - Add input file to sed command instead of using cat Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* kconfig: factor out ncurses check in a shell scriptSam Ravnborg2006-01-082-36/+79
| | | | | | | | Cleaning up the lxdialog Makefile by factoring out the ncurses compatibility checks. This made the checks much more obvious and easier to extend. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* kbuild: introduce escsq to escapre single quotesSam Ravnborg2006-01-062-6/+11
| | | | | | | This makes things a little bit more reader friendly and gvim is less confused. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* kconfig: fix gconfig with POSIXLY_CORRECT=1Adrian Bunk2006-01-061-4/+4
| | | | | | | | | | This patch fixed "make gconfig" with POSIXLY_CORRECT=1 set. This issue was reported by Jens Elkner <elkner@linofee.org> in kernel Bugzilla #2919. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* kbuild: un-stringnify KBUILD_MODNAMESam Ravnborg2006-01-0610-15/+13
| | | | | | | | | | | | | | | | | Now when kbuild passes KBUILD_MODNAME with "" do not __stringify it when used. Remove __stringnify for all users. This also fixes the output of: $ ls -l /sys/module/ drwxr-xr-x 4 root root 0 2006-01-05 14:24 pcmcia drwxr-xr-x 4 root root 0 2006-01-05 14:24 pcmcia_core drwxr-xr-x 3 root root 0 2006-01-05 14:24 "processor" drwxr-xr-x 3 root root 0 2006-01-05 14:24 "psmouse" The quoting of the module names will be gone again. Thanks to GregKH + Kay Sievers for reproting this. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* gitignore: ignore shared objectsBrian Gerst2006-01-062-1/+1
| | | | | | | Many arches make shared objects for VDSOs. Generally exclude them. Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* kbuild: Use git in scripts/setlocalversionRene Scharfe2006-01-061-51/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently scripts/setlocalversion is a Perl script that tries to figure out the current git commit ID of a repo without using git. It also imports Digest::MD5 without using it and generally is too big for the small task it does. :] And it always reports a git ID, even when the HEAD is tagged -- this is a bug. This patch replaces it with a Bourne Shell script that uses git commands to do the same. I can't come up with a scenario where someone would use a git repo and refuse to install git core at the same time, so I think it's reasonable to assume git is available. The new script also reports uncommitted changes by adding -git_dirty to the version string. Obviously you can't see from that _what_ has been changed from the last commit, so it's more of a reminder that you forgot to commit something. The script is easily extensible: simply add a check for Mercurial (or whatever) below the git check. Note: the script doesn't print a newline char anymore. That's only because it was easier to implement it that way, not a feature (or bug). 'make kernelrelease' doesn't care. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* kbuild: document howto build external modules using several directoriesSam Ravnborg2006-01-061-0/+40
| | | | | | | | | Update modules.txt with info how to build external modules with files in several directories. The question popped up on lkml often enough to warrant this, let's see if people read this stuff - or google hits it. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* [PATCH] i386: PTRACE_POKEUSR: allow changing RF bit in EFLAGS register.Chuck Ebbert2006-01-051-3/+6
| | | | | | | | | | | | | | | | | Setting RF (resume flag) allows a debugger to resume execution after a code breakpoint without tripping the breakpoint again. It is reset by the CPU after execution of one instruction. Requested by Stephane Eranian: "I am trying to the user HW debug registers on i386 and I am running into a problem with ptrace() not allowing access to EFLAGS_RF for POKEUSER (see FLAG_MASK). [ ... ] It avoids the need to remove the breakpoint, single step, and reinstall. The equivalent functionality exists on IA-64 and is allowed by ptrace()" Cc: Stephane Eranian <eranian@hpl.hp.com> Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge http://oss.oracle.com/git/ocfs2Linus Torvalds2006-01-05119-56/+46657
|\
| * [PATCH] o Update Kconfig documentation to reflect support for readonly mounts.Mark Fasheh2006-01-031-1/+0
| | | | | | | | Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * [PATCH] This patch contains the following cleanups:Adrian Bunk2006-01-033-8/+3
| | | | | | | | | | | | | | | | | | - cluster/sys.c: make needlessly global code static - dlm/: "extern" declarations for variables belong into header files (and in this case, they are already in dlmdomain.h) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemMark Fasheh2006-01-032-11/+43
| | | | | | | | | | | | | | | | Link the code into the kernel build system. OCFS2 is marked as experimental. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemMark Fasheh2006-01-0355-0/+24504
| | | | | | | | | | | | | | The OCFS2 file system module. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemMark Fasheh2006-01-038-1/+1617
| | | | | | | | | | | | | | | | | | | | dlmfs: A minimal dlm userspace interface implemented via a virtual file system. Most of the OCFS2 tools make use of this to take cluster locks when doing operations on the file system. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemKurt Hackel2006-01-0317-0/+10830
| | | | | | | | | | | | | | | | | | | | A distributed lock manager built with the cluster file system use case in mind. The OCFS2 dlm exposes a VMS style API, though things have been simplified internally. The only lock levels implemented currently are NLMODE, PRMODE and EXMODE. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemZach Brown2006-01-037-0/+2624
| | | | | | | | | | | | | | | | Node messaging via tcp. Used by the dlm and the file system for point to point communication between nodes. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemMark Fasheh2006-01-033-0/+1916
| | | | | | | | | | | | | | | | | | Disk based heartbeat. Configured and started from userspace, the kernel component handles I/O submission and event generation via callback mechanism. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemKurt Hackel2006-01-037-0/+1001
| | | | | | | | | | | | | | | | | | A simple node information service, filled and updated from userspace. The rest of the stack queries this service for simple node information. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] OCFS2: The Second Oracle Cluster FilesystemZach Brown2006-01-032-0/+441
| | | | | | | | | | | | | | | | Very simple printk wrapper which adds the ability to enable various sets of debug messages at run-time. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
| * [PATCH] add AOP_TRUNCATED_PAGE, prepend AOP_ to WRITEPAGE_ACTIVATEZach Brown2006-01-039-45/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readpage(), prepare_write(), and commit_write() callers are updated to understand the special return code AOP_TRUNCATED_PAGE in the style of writepage() and WRITEPAGE_ACTIVATE. AOP_TRUNCATED_PAGE tells the caller that the callee has unlocked the page and that the operation should be tried again with a new page. OCFS2 uses this to detect and work around a lock inversion in its aop methods. There should be no change in behaviour for methods that don't return AOP_TRUNCATED_PAGE. WRITEPAGE_ACTIVATE is also prepended with AOP_ for consistency and they are made enums so that kerneldoc can be used to document their semantics. Signed-off-by: Zach Brown <zach.brown@oracle.com>
| * [PATCH] configfs: User-driven configuration filesystemJoel Becker2006-01-0315-0/+3575
| | | | | | | | | | | | | | | | Configfs, a file system for userspace-driven kernel object configuration. The OCFS2 stack makes extensive use of this for propagation of cluster configuration information into kernel. Signed-off-by: Joel Becker <joel.becker@oracle.com>
* | Update MAINTAINERS - Jody is no longer at Steamballoon.Jody McIntyre2006-01-051-3/+3
| |
* | Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitJody McIntyre2006-01-05128-5709/+5045
|\ \
| * | [NET]: Change 1500 to ETH_DATA_LEN in some filesKris Katterjohn2006-01-056-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | These patches add the header linux/if_ether.h and change 1500 to ETH_DATA_LEN in some files. Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPVS]: Another file needs linux/interrupt.hAndrew Morton2006-01-051-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2006-01-0576-5351/+2534
| |\ \
| | * | [PATCH] pcmcia: add some IDs for ide-cs and dtl1_csRichard Purdie2006-01-062-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some PCMCIA device IDs for the microdrive found in the Sharp Zaurus and a different revision of the Socket CF+ Bluetooth card. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: cleanup cs.c, reduce sizeDaniel Ritz2006-01-061-49/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kill the socket_shutdown()/shutdown_socket() confusion by making it one single function. move cs_socket_put() in there. nicer to read and smaller: original: text data bss dec hex filename 25181 1076 32 26289 66b1 drivers/pcmcia/pcmcia_core.ko patched: text data bss dec hex filename 24973 1076 32 26081 65e1 drivers/pcmcia/pcmcia_core.ko Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] drivers/pcmcia/cistpl.c: fix endian warningsAlexey Dobriyan2006-01-061-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: kzalloc conversionDominik Brodowski2006-01-069-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert users of kmalloc and memset to kzalloc Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: no probing of ioports on PARISCDominik Brodowski2006-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not wildly probe the IO ports we're trying to use on PARISC. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: export stored values in sysfsDominik Brodowski2006-01-061-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export the stored values instead of re-reading everything in the socket information sysfs files, and make them accessible to all users, not only to root. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] 8xx PCMCIA: support for MPC885ADS and MPC866ADSVitaly Bordug2006-01-061-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds PCMCIA support for both MPC885ADS and MPC866ADS. This is established not together with FADS, because 885 does not have io_block_mapping() for BCSR area. Also, some cleanups done both for 885ADS and MBX. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] m8xx_pcmcia: support MAP_AUTOSZ required for CF cardsVitaly Bordug2006-01-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes misconfiguration that could result in odd work of some old CF cards. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: properly handle static mem, but dynamic io socketsDominik Brodowski2006-01-063-2/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some PCMCIA sockets have statically mapped memory windows, but dynamically mapped IO windows. Using the "nonstatic" socket library is inpractical for them, as they do neither need a resource database (as we can trust the kernel resource database on m68k and ppc) nor lots of other features of that library. Let them get a small "iodyn" socket library (105 lines of code) instead. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: fix sound driversDominik Brodowski2006-01-062-194/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the PCMCIA sound drivers to handle the recent changes to the PCMCIA core. A part of this merge was done by Takashi Iwai <tiwai@suse.de>. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: unify attach, EVENT_CARD_INSERTION handlers into one probe ↵Dominik Brodowski2006-01-0648-2233/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callback Unify the EVENT_CARD_INSERTION and "attach" callbacks to one unified probe() callback. As all in-kernel drivers are changed to this new callback, there will be no temporary backwards-compatibility. Inside a probe() function, each driver _must_ set struct pcmcia_device *p_dev->instance and instance->handle correctly. With these patches, the basic driver interface for 16-bit PCMCIA drivers now has the classic four callbacks known also from other buses: int (*probe) (struct pcmcia_device *dev); void (*remove) (struct pcmcia_device *dev); int (*suspend) (struct pcmcia_device *dev); int (*resume) (struct pcmcia_device *dev); Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: remove dev_list from driversDominik Brodowski2006-01-0638-651/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linked list of devices managed by each PCMCIA driver is, in very most cases, unused. Therefore, remove it from many drivers. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: remove old detach mechanismDominik Brodowski2006-01-063-62/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the old "detach" mechanism as it is unused now. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: unify detach, REMOVAL_EVENT handlers into one remove callbackDominik Brodowski2006-01-0647-896/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify the "detach" and REMOVAL_EVENT handlers to one "remove" function. Old functionality is preserved, for the moment. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: merge suspend into device modelDominik Brodowski2006-01-064-11/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the suspend and resume methods for 16-bit PCMCIA cards into the device model -- for both runtime power management and suspend to ram/disk. Bugfix in ds.c by Richard Purdie Signed-Off-By: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: new suspend coreDominik Brodowski2006-01-0545-991/+1431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the suspend and resume methods out of the event handler, and into special functions. Also use these functions for pre- and post-reset, as almost all drivers already do, and the remaining ones can easily be converted. Bugfix to include/pcmcia/ds.c Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] yenta: make bridge specific init code configurableDaniel Ritz2006-01-053-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the bridge specific initialization code config options depending on CONFIG_EMBEDDED. Config options for TI/EnE, Toshiba, Ricoh and O2Micro are available. Disabling all of the specific tweaks cuts off more than half of yenta_socket.ko. Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: validate_mem fixAndrew Morton2006-01-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also return a value if CONFIG_PCMCIA_PROBE is not set. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: validate_mem shouldn't be voidDominik Brodowski2006-01-055-62/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a return value to pcmcia_validate_mem. Only if we have enough memory available to map the CIS, we should proceed in trying to determine information about the device. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: remove get_socket callbackDominik Brodowski2006-01-0515-607/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .get_socket callback is never used by the PCMCIA core, therefore remove it. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| | * | [PATCH] pcmcia: remove socket register_callbackDominik Brodowski2006-01-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the register_callback declaration in struct pccard_operations as it is unused. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
OpenPOWER on IntegriCloud