David Brownell [Tue, 19 Apr 2005 00:39:22 +0000 (17:39 -0700)]
[PATCH] usb resume fixes
This has a variety of updates to the shared suspend/resume code for
PCI based USB host controllers.
- Cope with pm_message_t replacing the target system state.
This is actually a loss of functionality; PCI D1 and D2
states will no longer be used, and it's no longer knowable
that D3cold is on the way so power will be lost.
- Most importantly, some of the resume paths are reworked and
cleaned up. They're now an exact mirror of suspend paths,
and more care is taken to ensure the hardware is reactivated
before the hardware re-enables interrupts.
Plus comment and diagnostic cleanups; there are some nasty cases here
especially combined with swsusp, now they're somewhat commented.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff -puN drivers/usb/core/hcd-pci.c~usb-resume-fixes drivers/usb/core/hcd-pci.c
akpm@osdl.org [Tue, 19 Apr 2005 00:39:21 +0000 (17:39 -0700)]
[PATCH] USB: usb_cdc build fix
With older gcc's:
In file included from drivers/usb/class/cdc-acm.c:63:
include/linux/usb_cdc.h:117: field `bDetailData' has incomplete type
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff -puN include/linux/usb_cdc.h~usb_cdc-build-fix include/linux/usb_cdc.h
Larry Battraw [Tue, 19 Apr 2005 00:39:20 +0000 (17:39 -0700)]
[PATCH] USB: visor Tapwave Zodiac support patch
Here's a tiny patch to add support for the Tapwave Zodiac (for
2.6.11.6). I've been meaning to send it in for a while but kept
upgrading my kernel and losing the changes :-) I own the device and it
works fine with the latest pilot-link beta.
From: Larry Battraw <lbattraw@insightbb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
gregkh@suse.de [Tue, 19 Apr 2005 00:39:20 +0000 (17:39 -0700)]
[PATCH] USB: add new visor id for Treo 650
Thanks to Jamieson Becker <jamie@jamiebecker.com> for the info
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff -Naur -X dontdiff-osdl tmp/linux-2.6.12-rc2/drivers/usb/serial/visor.h linux-2.6/drivers/usb/serial/visor.h
Linus Torvalds [Mon, 18 Apr 2005 23:25:10 +0000 (16:25 -0700)]
Merge ... kernel.org:/home/rmk/linux-2.6-rmk.git
This adds the missing arch/arm/lib/bitops.h file.
David S. Miller [Mon, 18 Apr 2005 22:13:15 +0000 (15:13 -0700)]
[PATCH] sparc64: Fix stat
Like Alpha, sparc64's struct stat was defined before we had the
nanosecond et al. fields added. So like Alpha I have to cons up a
struct stat64 to get this stuff. I'll work on the glibc bits soon.
Also, we were forgetting to fill in the nanosecond fields in the sparc
compat stat64 syscalls.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Mon, 18 Apr 2005 21:50:01 +0000 (22:50 +0100)]
[PATCH] ARM: Add missing new file for bitops patch
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Linus Torvalds [Mon, 18 Apr 2005 21:25:40 +0000 (14:25 -0700)]
Merge SCSI tree from James Bottomley.
Done with "git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git"
together with an automated content merge.
Ingo Molnar [Mon, 18 Apr 2005 17:58:36 +0000 (10:58 -0700)]
[PATCH] sched: fix signed comparisons of long long
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Howells [Mon, 18 Apr 2005 17:54:51 +0000 (10:54 -0700)]
[PATCH] Add 32-bit compatibility for NFSv4 mount
This adds 32-bit compatibility for mounting an NFSv4 mount on a 64-bit
kernel (such as happens with PPC64).
The problem is that the mount data for the NFS4 mount process includes
auxilliary data pointers, probably because the NFS4 mount data may
conceivably exceed PAGE_SIZE in size - thus breaking against the hard
limit imposed by sys_mount().
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Stephen Smalley [Mon, 18 Apr 2005 17:47:35 +0000 (10:47 -0700)]
[PATCH] SELinux: fix deadlock on dcache lock
This fixes a deadlock on the dcache lock detected during testing at IBM
by moving the logging of the current executable information from the
SELinux avc_audit function to audit_log_exit (via an audit_log_task_info
helper) for processing upon syscall exit.
For consistency, the patch also removes the logging of other
task-related information from avc_audit, deferring handling to
audit_log_exit instead.
This allows simplification of the avc_audit code, allows the exe
information to be obtained more reliably, always includes the comm
information (useful for scripts), and avoids including bogus task
information for checks performed from irq or softirq.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Geert Uytterhoeven [Mon, 18 Apr 2005 17:47:34 +0000 (10:47 -0700)]
[PATCH] M68k: Update defconfigs for 2.6.12-rc2
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Geert Uytterhoeven [Mon, 18 Apr 2005 17:47:33 +0000 (10:47 -0700)]
[PATCH] M68k: Update defconfigs for 2.6.11
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Chris Wedgwood [Mon, 18 Apr 2005 15:01:30 +0000 (08:01 -0700)]
[PATCH] x86: fix acpi compile without CONFIG_ACPI_BUS
The recent acpi boot patch breaks for me: acpi_fadt needs CONFIG_ACPI_BUS.
Signed-off-By: Chris Wedgwood <cw@f00f.org>
Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jurij Smakov [Mon, 18 Apr 2005 01:03:12 +0000 (18:03 -0700)]
[PATCH] sparc64: Fix copy_sigingo_to_user32()
The compat routine to copy over this data structure was not
handling SI_POLL correctly, breaking various fcntl() variants
in compat tasks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David S. Miller [Mon, 18 Apr 2005 01:03:11 +0000 (18:03 -0700)]
[PATCH] sparc64: Reduce ptrace cache flushing
We were flushing the D-cache excessively for ptrace() processing
and this makes debugging threads so slow as to be totally unusable.
All process page accesses via ptrace() go via access_process_vm().
This routine, for each process page, uses get_user_pages(). That
in turn does a flush_dcache_page() on the child pages before we
copy in/out the ptrace request data.
Therefore, all we need to do after the data movement is:
1) Flush the D-cache pages if the kernel maps the page to a different
color than userspace does.
2) If we wrote to the page, we need to flush the I-cache on older cpus.
Previously we just flushed the entire cache at the end of a ptrace()
request, and that was beyond stupid.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David S. Miller [Mon, 18 Apr 2005 01:03:11 +0000 (18:03 -0700)]
[PATCH] sparc: Fix PTRACE_CONT bogosity
SunOS aparently had this weird PTRACE_CONT semantic which
we copied. If the addr argument is something other than
1, it sets the process program counter to whatever that
value is.
This is different from every other Linux architecture, which
don't do anything with the addr and data args.
This difference in particular breaks the Linux native GDB support
for fork and vfork tracing on sparc and sparc64.
There is no interest in running SunOS binaries using this weird
PTRACE_CONT behavior, so just delete it so we behave like other
platforms do.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David S. Miller [Mon, 18 Apr 2005 01:03:10 +0000 (18:03 -0700)]
[PATCH] sparc64: use message queue compat syscalls
A couple message queue system call entries for compat tasks
were not using the necessary compat_sys_*() functions, causing
some glibc test cases to fail.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David S. Miller [Mon, 18 Apr 2005 01:03:09 +0000 (18:03 -0700)]
[PATCH] sparc64: Do not flush dcache for ZERO_PAGE.
This case actually can get exercised a lot during an ELF
coredump of a process which contains a lot of non-COW'd
anonymous pages. GDB has this test case which in partiaular
creates near terabyte process full of ZERO_PAGEes. It takes
forever to just walk through the page tables because of
all of these spurious cache flushes on sparc64.
With this change it takes only a second or so.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sun, 17 Apr 2005 21:47:24 +0000 (14:47 -0700)]
Merge ... /home/rmk/linux-2.6-rmk.git - ARM changes
First ever true git merge. Let's see if it actually works.
Linus Torvalds [Sun, 17 Apr 2005 20:30:46 +0000 (13:30 -0700)]
Fix up some file mode differences due to the new git world order.
David Brownell [Sun, 17 Apr 2005 17:57:20 +0000 (10:57 -0700)]
[PATCH] revert fs/char_dev.c CONFIG_BASE_FULL change
This reverts a fs/char_dev.c patch that was merged into BK on March 3.
The problem is that it breaks things ... __register_chrdev_region() has
a block of code, commented "temporary" for over two years now, which
fails rudely during PCMCIA initialization or other register_chrdev()
calls, because it doesn't "degrade to linked list". This keeps whole
subsystems from working.
A real fix to that "temporary" code should be possible, using some better
scheme to allocate major numbers, but it's not something I want to spend
time on just now.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Sun, 17 Apr 2005 15:28:31 +0000 (16:28 +0100)]
[PATCH] ARM: fix debug macros
Fix debug EBSA285 and RiscPC debugging macros to detect whether the
MMU is enabled.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Russell King [Sun, 17 Apr 2005 14:51:02 +0000 (15:51 +0100)]
[PATCH] ARM: bitops
Convert ARM bitop assembly to a macro. All bitops follow the same
format, so it's silly duplicating the code when only one or two
instructions are different.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Russell King [Sun, 17 Apr 2005 14:50:36 +0000 (15:50 +0100)]
[PATCH] ARM: showregs
Fix show_regs() to provide a backtrace. Provide a new __show_regs()
function which implements the common subset of show_regs() and die().
Add prototypes to asm-arm/system.h
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Russell King [Sun, 17 Apr 2005 14:40:46 +0000 (15:40 +0100)]
[PATCH] ARM: h3600_irda_set_speed arguments
h3600_irda_set_speed() had the wrong type for the "speed" argument.
Fix this.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Russell King [Sun, 17 Apr 2005 14:36:55 +0000 (15:36 +0100)]
[PATCH] ARM: footbridge rtc init
The footbridge ISA RTC was being initialised before we had setup the
kernel timer. This caused a divide by zero error when the current
time of day is set. Resolve this by initialising the RTC after
the kernel timer has been initialised.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>