summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Really __nocast-annotate kmalloc_node()Alexey Dobriyan2005-07-271-1/+1
| | | | | | | | | | One chunk was lost somewhere between my and Andrew's machine. Noticed by Victor Fusco. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] user_mode_vm() build fixAndrew Morton2005-07-271-0/+3
| | | | | | | | | include/asm/ptrace.h: In function `user_mode_vm': include/asm/ptrace.h:67: `VM_MASK' undeclared (first use in this function) Cc: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] i386: clean up user_mode macrosChuck Ebbert2005-07-261-3/+10
| | | | | | | | | | - make the new user_mode() return 0 or 1 (same as x86_64) - remove conditional jump from user_mode_vm() it's called every timer tick on each CPU on SMP) Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-07-262-1/+3
|\
| * [NETFILTER]: Fix ip_conntrack_put() prototype.Adrian Bunk2005-07-261-1/+1
| | | | | | | | | | | | | | The function is not inline. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [TG3]: add 5780 basic supportMichael Chan2005-07-251-0/+2
| | | | | | | | | | | | | | Add 5780 PCI IDs, chip IDs, and other basic support. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-07-261-3/+7
|\ \
| * | [PATCH] ARM: 2819/1: Fix several S3C24x0 IIS definesDimitry Andric2005-07-261-3/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Dimitry Andric - Change S3C2440_IISCON_MPLL to S3C2440_IISMOD_MPLL: The S3C2440 IISCON register doesn\'t control the master clock selection, this is done with the IISMOD register. - Correct S3C2410_IISMOD_256FS and S3C2410_IISMOD_384FS: This is set via bit 2 of IISMOD, not bit 1. - Add S3C2410_IISCON_PSCEN (prescaler enable), for completeness\' sake. Signed-off-by: Dimitry Andric <dimitry.andric@tomtom.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/home/rmk/linux-2.6-arm-smpLinus Torvalds2005-07-264-58/+127
|\ \
| * | [PATCH] ARM SMP: Add ARMv6 memory barriersRussell King2005-07-264-29/+69
| | | | | | | | | | | | | | | | | | | | | | | | Convert explicit gcc asm-based memory barriers into smp_mb() calls. These change between barrier() and the ARMv6 data memory barrier instruction depending on whether ARMv6 SMP is enabled. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] ARM SMP: Use exclusive load/store for __xchgRussell King2005-07-261-29/+58
| |/ | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [PATCH] x86_64: Implemenent machine_emergency_restartEric W. Biederman2005-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | It is not safe to call set_cpus_allowed() in interrupt context and disabling the apics is complicated code. So unconditionally skip machine_shutdown in machine_emergency_reboot on x86_64. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] i386: Implement machine_emergency_rebootEric W. Biederman2005-07-261-1/+1
| | | | | | | | | | | | | | | | | | set_cpus_allowed is not safe in interrupt context and disabling apics is complicated code so don't call machine_shutdown on i386 from emergency_restart(). Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Add emergency_restart()Eric W. Biederman2005-07-2626-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the kernel is working well and we want to restart cleanly kernel_restart is the function to use. But in many instances the kernel wants to reboot when thing are expected to be working very badly such as from panic or a software watchdog handler. This patch adds the function emergency_restart() so that callers can be clear what semantics they expect when calling restart. emergency_restart() is expected to be callable from interrupt context and possibly reliable in even more trying circumstances. This is an initial generic implementation for all architectures. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Refactor sys_reboot into reusable partsEric W. Biederman2005-07-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | Because the factors of sys_reboot don't exist people calling into the reboot path duplicate the code badly, leading to inconsistent expectations of code in the reboot path. This patch should is just code motion. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] inotify: add x86-64 syscall entriesRobert Love2005-07-262-3/+14
| | | | | | | | | | | | | | | | Add inotify syscall entries to x86-64. Signed-off-by: Robert Love <rml@novell.com> Signed-off-by: John McCutchan <ttb@tentacle.dhs.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6Linus Torvalds2005-07-265-14/+13
|\ \ | |/ |/|
| * [SCSI] fix function prototype warningJames Bottomley2005-07-141-1/+1
| | | | | | | | | | | | | | | | int_to_scsilun() takes a pointer to a struct scsi_lun in it's prototype, so add this structure to scsi_device.h to avoid declaration inside function prototype warnings. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] add int_to_scsilun() functionJames.Smart@Emulex.Com2005-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the issues we had was reverting the midlayers lun value into the 8byte lun value that we wanted to send to the device. Historically, there's been some combination of byte swapping, setting high/low, etc. There's also been no common thread between how our driver did it and others. I also got very confused as to why byteswap routines were being used. Anyway, this patch is a LLDD-callable function that reverts the midlayer's lun value, stored in an int, to the 8-byte quantity (note: this is not the real 8byte quantity, just the same amount that scsilun_to_int() was able to convert and store originally). This also solves the dilemma of the thread: http://marc.theaimsgroup.com/?l=linux-kernel&m=112116767118981&w=2 A patch for the lpfc driver to use this function will be along in a few days (batched with other patches). Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] qla2xxx: Add pci ids for new ISP types.Andrew Vasquez2005-07-141-0/+9
| | | | | | | | | | | | | | | | | | | | Add pci ids for new ISP types. Move old definitions in local qla_def.h file to pci_ids.h as well. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] add TYPE_RBC to our type tableJames Bottomley2005-07-111-2/+2
| | | | | | | | | | | | | | Here's a tiny update that means we print the correct ASCII type information Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] remove scsi_cmnd->stateChristoph Hellwig2005-06-261-1/+0
| | | | | | | | | | | | | | | | | | We never look at it except for the old megaraid driver that abuses it for sending internal commands. That usage can be fixed easily because those internal commands are single-threaded by a mutex and we can easily use a completion there. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] remove scsi_cmnd->ownerChristoph Hellwig2005-06-261-1/+0
| | | | | | | | | | | | never checked anywhere Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] remove scsi_cmnd->abort_reasonChristoph Hellwig2005-06-261-2/+0
| | | | | | | | | | | | Never used for anything but printing it out in debug routines. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] remove scsi_cmnd.eh_stateChristoph Hellwig2005-06-261-1/+0
| | | | | | | | | | | | | | it's never set to anything, and just three broken drivers are looking at it and doing odd things. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * [SCSI] remove scsi_set_deviceChristoph Hellwig2005-06-261-6/+0
| | | | | | | | | | | | | | | | | | | | | | scsi_add_host is the proper place to set the device, but people copy the scsi_set_device usage from older drivers again and again. note that this leaves some legacy drivers like qlogicisp/qlogicfc without pci association in sysfs, but they're scheduled to go away soon anyway. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-07-241-1/+1
|\ \
| * | [W1]: Do not use NFLOG netlink number.David S. Miller2005-07-241-1/+1
| | | | | | | | | | | | | | | | | | Use the reserved by never used NETLINK_SKIP value instead. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-07-247-256/+47
|\ \ \
| * | | [SPARC64]: Move syscall success and newchild state out of thread flags.David S. Miller2005-07-243-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two bits were accesses non-atomically from assembler code. So, in order to eliminate any potential races resulting from that, move these pieces of state into two bytes elsewhere in struct thread_info. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Privatize sun5_timer.David S. Miller2005-07-241-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is only used by some localized code in irq.c, and also delete enable_prom_timer() as that is totally unused. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Kill totally unused inline functions from asm/spitfire.hDavid S. Miller2005-07-241-130/+0
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Simplify asm/rwsem.h slightly.David S. Miller2005-07-241-44/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rwsem_atomic_update and rwsem_atomic_add can be implemented straightly using atomic_*() routines. Also, rwsem_cmpxchgw() is totally unused, kill it. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Non-atomic bitops do not need volatile operationsDavid S. Miller2005-07-241-28/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Noticed this while comparing sparc64's bitops.h to ppc64's. We can cast the volatile memory argument to be non-volatile. While we're here, __inline__ --> inline. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [PATCH] ARM SMP: Fix ARMv6 spinlock and semaphore implementationsRussell King2005-07-242-18/+21
|/ / | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-07-231-0/+2
|\ \
| * | [PATCH] Serial: Add support for SIIG Quartet serial cardAndrey Panin2005-07-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for SIIG Quartet Serial card. This card has Oxford Semiconducor 16954 quad UART which is clocked by 10x faster (18.432 MHz) quartz. Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-07-231-0/+1
|\ \ \
| * | | [PATCH] ARM: 2687/1: i.MX framebuffer: make dmacr register platform configurableSascha Hauer2005-07-171-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Sascha Hauer The dmacr needs different settings on some boards. This patch makes the register configurable by the platform part. Also we have imxfb_disable_controller(), so lets use it. Signed-off-by: Steven Scholz Signed-off-by: Sascha Hauer Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | x86: use alternative instructions for fnsave/fxsave tooLinus Torvalds2005-07-221-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | This one ends up using an inline asm format that claims to read memory and then clobber it (rather than just write it directly), which made it easier to use the existing "alternative_input()" infrastructure support. Now the fxsave code matches the fxrstor.
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-07-226-15/+12
|\ \ \
| * | | [PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT}David S. Miller2005-07-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More unusable TCF_META_* match types that need to get eliminated before 2.6.13 goes out the door. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Thomas Graf <tgraf@suug.ch>
| * | | [PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch.David S. Miller2005-07-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It won't exist any longer when we shrink the SKB in 2.6.14, and we should kill this off before anyone in userspace starts using it. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Thomas Graf <tgraf@suug.ch>
| * | | [NETFILTER]: ip_conntrack_expect_related must not free expectationRusty Russell2005-07-212-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a connection tracking helper tells us to expect a connection, and we're already expecting that connection, we simply free the one they gave us and return success. The problem is that NAT helpers (eg. FTP) have to allocate the expectation first (to see what port is available) then rewrite the packet. If that rewrite fails, they try to remove the expectation, but it was freed in ip_conntrack_expect_related. This is one example of a larger problem: having registered the expectation, the pointer is no longer ours to use. Reference counting is needed for ctnetlink anyway, so introduce it now. To have a single "put" path, we need to grab the reference to the connection on creation, rather than open-coding it in the caller. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NET]: Make ipip/ip6_tunnel independant of XFRMPatrick McHardy2005-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP]: Fix potential null pointer dereference while handling an icmp errorSridhar Samudrala2005-07-181-5/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NET]: Fix "nocast type" warnings in skbuff.hVictor Fusco2005-07-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Victor Fusco <victor@cetuc.puc-rio.br> Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [PKT_SCHED]: Kill TCF_META_ID_TCCLASSID.Patrick McHardy2005-07-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thomas Graf states: > I used to mark such ids as obsolete in the header but since > skb is on diet anyway and there has been no official > iproute2 release with the ematch bits included it might be > a better idea to remove the ids from the header completely. > Those that have picked up my patch on netdev shouldn't care > about a ABI breakage, actually I doubt that someone is using > it already. So here's the patch to remove it. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | x86: make restore_fpu() use alternative assembler instructionsLinus Torvalds2005-07-221-1/+12
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | It's really just a single instruction, conditional on whether the CPU supports FXSR or not, so implement it as such instead of making it a function that queries FXSR dynamically. This means that the instruction just gets automatically rewritten to the correct one at boot-time.
* | | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-07-163-5/+7
|\ \ \
OpenPOWER on IntegriCloud