Alexander Viro [Thu, 29 Jul 2004 15:48:06 +0000 (08:48 -0700)]
[PATCH] fbcon_do_set_font() sanitized
fbcon internal cleanup. Instead of passing console_font_op into
fbcon_do_set_font() we pass width/height directly. Amusing (but harmless)
bug fixed there:
if (!w > 32) {
bogus code that fortunately never got triggered
}
Fixed by removal of the junk in question (and yes, it's verifiable junk -
it would not do anything even if we replaced the check with intended
!(w > 32)).
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexander Viro [Thu, 29 Jul 2004 15:47:55 +0000 (08:47 -0700)]
[PATCH] con_set_font sanitized
con_font_set() sanitized. We are passing console_font and flags into
the method in separate arguments and we are not messing with
console_font_op->data anymore - it's a userland pointer (to be annotated
several patches later in the series, due to another abuse of console_font_op
that needs to be fixed first), while console_font->data is kernel one
and they don't mix anymore.
We also do a sanity check (font width > 0) in the caller instead of
method instances, since we are already checking for width <= 32 and
height <= 32 there; doesn't make sense leaving that one in method
instances.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexander Viro [Thu, 29 Jul 2004 15:47:43 +0000 (08:47 -0700)]
[PATCH] con_font_copy sanitized
->con_font_copy() sanitized. We extract the number of console to copy the
font from in the caller (it's taken from the field of console_font_op that
is normally used for font height - messy even for an ioctl, but that animal
used to be passed all the way down into console drivers).
With decoding done in con_font_copy(), we simply pass source console number
into the method.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexander Viro [Thu, 29 Jul 2004 15:47:32 +0000 (08:47 -0700)]
[PATCH] con_font_default sanitized
->con_font_default() sanitized. We copy font name (if any) from userland
in the caller and pass it explicitly. We are also beginning to get rid
of console_font_op in method arguments.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexander Viro [Thu, 29 Jul 2004 15:47:21 +0000 (08:47 -0700)]
[PATCH] con_font_op split
Preparations for cleanups: con_font_op() is turned into a switch calling
con_font_{get,set,default,copy} depending on the operation required;
method ->con_font_op() also split, with NULL resulting in -ENOSYS on
operation in question.
Code that used to be in con_font_op() got slightly cleaned up after move
into new helpers (we are beginning to untangle the mess; there will be
more cleanups in the next patches).
Methods are currently using exact same arguments as old ->con_font_op().
That will change in subsequent patches, method by method (right now there's
a hell of a scary field reuse between them, making impossible to do any
static checks and practically begging for bugs).
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This fixes some possible rare issues with the hash code beeing called
with interrupts enabled from update_mmu_cache, and fixes some races in
the iSeries low level htab code by adding an array of spinlocks
This is actually an old patch already present in SLES kernel and that
got "missed" somewhat in the main tree, adapted to recent changes.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Tony Luck [Wed, 28 Jul 2004 17:57:12 +0000 (17:57 +0000)]
# Signed-off-by: Gordon Jin <gordon.jin@intel.com>
# Signed-off-by: Arun Sharma <arun.sharma@intel.com>
# Signed-off-by: Tony Luck <tony.luck@intel.com>
[PATCH] Watchdog driver for Intel IXP2000 Network Processor
Following patch adds support for the watchdog driver embedded in Intel's
IXP2000 family of network processors. The architecture-specific bits of
IXP2000 support will be merged upstream via the ARM tree once all the
various drivers have been merged.
Olaf Hering [Wed, 28 Jul 2004 16:13:40 +0000 (09:13 -0700)]
[PATCH] mark swim3 floppy controller as removable device
Mark the mac floppy controller driver as removable media. This prevents an
entry in /proc/partitions. Several tools will not try to access the floppy
anymore with this change.
Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrea Arcangeli [Wed, 28 Jul 2004 16:13:18 +0000 (09:13 -0700)]
[PATCH] writepages drops bh on not uptodate page
I think I understood why some ext2 fs corruption still happens even after
the last i_size fix.
what happened I believe is that the writepages layer got a not a fully
uptodate page (in turn with bh mapped on top of it), and then right before
unlocking the page and entering the writeback mode, it freed all the bh.
Without bh a not uptodate page will trigger a full readpage from disk, that
overwrites the pagecache before the multi-bio gets submitted, generating fs
corruption.
I believe the below patch should fix it (untested) against kernel CVS.
The testcases developed by Kurt showed the pagecache being overwritten with
on-disk data at block offsets, and Chris as well was wondering about races
between wait_on_page_writeback and readpage. the below fix just explains
everything we've seen since not-fully-uptodate pages must have always bh on
them and the below patch enforces just that invariant, and it should fix
our pagecache-overwritten-by-disk-data problem.
Signed-off-by: Andrea Arcangeli <andrea@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alan Cox [Wed, 28 Jul 2004 16:12:55 +0000 (09:12 -0700)]
[PATCH] Subject: PATCH: fix bogus ioctl return in mtrr
This is fairly self explanatory - ENOIOCTLCMD is an internal code outside
of the -1 to -511 range. The correct return for an unknown ioctl is
-ENOTTY although some Linux devices return the incorrect -EINVAL result.
Patch-By: Alan Cox <alan@redhat.com>
OSDL Developer Certificate of Origin 1.0 included herein by reference
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
s390 core changes:
- Rework system call entry cleanup code to fix a potential asynchronous
interrupt stack overflow if the user stack pointer happens to be in
the same range as the asynchronous stack.
- Replace broken schedule_timeout call with msleep.
- Regenerate default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton [Wed, 28 Jul 2004 16:11:37 +0000 (09:11 -0700)]
[PATCH] ncpfs: setattr return value fix
Arjan's new warning found a bug!
fs/ncpfs/inode.c: In function `ncp_notify_change':
fs/ncpfs/inode.c:960: warning: ignoring return value of `inode_setattr', declared with attribute warn_unused_result
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
[PATCH] Add documentation about /proc/sys/vm/laptop_mode to various docs.
From: Bart Samwel <bart@samwel.tk>
A bunch of small laptop mode updates:
* Mention the laptop_mode and block_dump sysctls in the relevant docs,
referring to the laptop-mode.txt. Improve description of what the
laptop_mode knob means (i.e. seconds between last I/O and automatic
sync).
* Document the most relevant config file options.
* Change the installation instructions in the laptop mode doc to describe
the ACPI-bound version first, because this is the easiest. Explain
the non-ACPI version afterwards. Added a reference to my "packaged
version" of the scripts.
* Move the setting of hdparm and cpu frequency out of the ACPI script
and into the core laptop mode script. Add config option DO_HD to
enable hdparm. Add config setting HD to set device to do hdparm on.
Rename Dax's CPU_MANAGE to DO_CPU, with 0/1 instead of yes/no, to
improve consistency.
* Fix a problem where the root filesystem wouln't be remounted when
/etc/mtab listed its type as "unknown". Deduce the type of "unknown"
filesystems from /etc/fstab.
This depends on the patch that adds config files, which was submitted
to Linus by Dax Kelson on July 10.
Add support for a external configuration file for /sbin/laptop_mode, and
/etc/acpi/actions/battery.sh. Convert battery.sh to use CPUFreq (off by
default) instead of CPU throttling (that was off by default).
Cleanup some formating for 80 columns.
All changes were written by me on a plane flight from Philadelphia to Salt
Lake City on July 9th. :)
(Note from Bart Samwel: was submitted to Linus earlier, this patch is
unchanged from that. I needed to submit this into -mm for now because my
other changes are dependent on Dax's changes.)
Samuel Thibault [Wed, 28 Jul 2004 16:10:30 +0000 (09:10 -0700)]
[PATCH] front buttons wouldn't mute ESS Maestro
Here is a small fix to enable muting ESS Maestro sound card thanks to the
up/down buttons: when has reached the driver's minimum (! this is
something like -dB value), just mute. (It was working in OSS driver, but
not in ALSA)
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Make code for hlist_for_each_safe use better code (same as
hlist_for_each_entry_safe). Get rid of comment about prefetch, because
that was fixed a while ago. Only current use of this is in the bridge
code, that I maintain.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Wed, 28 Jul 2004 16:10:10 +0000 (09:10 -0700)]
[PATCH] Export all functions in lib/string.c
Quite a few functions in lib/string.c are not exported. I ran into this
trying to use strnchr() in a module.
This patch
- exports every function defined in lib/string.c
- adds some missing __HAVE_ARCH_xxx defines for i386
- gets rid of the exports of functions from lib/string.c in arch/s390
(BTW, why is s390 exporting things NOVERS?)
Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Domen Puncer [Wed, 28 Jul 2004 16:09:59 +0000 (09:09 -0700)]
[PATCH] remove faulty __init's from drivers/video/fbmem.c
From: Geert Uytterhoeven <geert@linux-m68k.org>
These four are called from fb_show_logo, which is exported symbol, called
by fbcon_switch.
From: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Eger [Wed, 28 Jul 2004 16:09:36 +0000 (09:09 -0700)]
[PATCH] cirrusfb: update for amiga (zorro)
Cirrusfb updates:
- Cirrusfb depends on Zorro or PCI
- Revive Zorro support, using new Zorro driver framework
- Merge PCI and Zorro code where possible
- Use C99 initializers
- Kill superfluous whitespace
- #undef I/O ops before redefining them on Amiga
From: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David Eger <eger@havoc.gtf.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
M68k maintainership update:
- Transfer maintainership to Roman and me (ack'ed by Jes and Roman)
- Update main website URL
- Add Linux/m68k CVS repository website
M68k: Fix build after <asm/pgalloc.h> surgery in 2.6.8-rc1:
- Add missing include on machines with a standard m68k MMU
- Convert __pte_free_tlb() to a macro (like it is on most other archs) on
Sun-3, to avoid include hell
[PATCH] fix readahead breakage for sequential after random reads
Current readahead logic is broken when a random read pattern is followed by
a long sequential read. The cause is that on a window miss ra->next_size
is set to ra->average, but ra->average is only updated at the end of a
sequence, so window size will remain 1 until the end of the sequential
read.
This patch fixes this by taking the current sequence length into account
(code taken from towards end of page_cache_readahead()), and also setting
ra->average to a decent value in handle_ra_miss() when sequential access is
detected.
Khalid Aziz [Wed, 28 Jul 2004 16:03:11 +0000 (09:03 -0700)]
[PATCH] ipmi_msghandler module load failure fix
On a 2.6.7 kernel, when I try to modprobe ipmi_msghandler, it fails to load
with following message:
FATAL: Error inserting ipmi_msghandler (/lib/modules/2.6.7/kernel/drivers/char/ipmi/ipmi_msghandler.ko): Invalid module format
And there is an error message in dmesg:
ipmi_msghandler: init symbol 0xa000000200058080 used in module code at a000000200031b32
What I have been able to determine is that ipmi_msghandler.c defines
ipmi_init_msghandler() as the module_init() routine and then it also calls
ipmi_init_msghandler() diretcly from couple of other places. This does not
seem to be okay in 2.6.7 kernel. I was able to fix this by defining a new
module_init routine which in turn calls ipmi_init_msghandler(). I also
removed __init from ipmi_init_msghandler() since it gets called from
ipmi_open() on an open of the ipmi device file. So I would think we want
to keep ipmi_init_msghandler() around even after initialization.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Fix a bug in do_proc_doulongvec_minmax() where the the string buffer was
too short to parse a 64-bit number expressed in decimal. That was causing
problems with entries in /proc/sys using long and allowing large number
(such as -1)
[PATCH] Fix rivafb's NV_ARCH_, cleanup DEBUG, backlight control on ppc
- fixes the PCI-IDs (needed to get it to work on at least the NV17)
- cleans up the DEBUG option (similar to the new radeonfb). This also
makes it easy to replace printk by btext_printf() (on ppc) or similar to
ease debugging of the fb code when all else fails.
inadvertently broke ia64 because the patch assumed that pgd_offset_k() is
just an optimization of pgd_offset(), which it is not. This patch fixes
the problem by introducing pgd_offset_gate(). On architectures on which
the gate area lives in the user's address-space, this should be aliased to
pgd_offset() and on architectures on which the gate area lives in the
kernel-mapped segment, this should be aliased to pgd_offset_k().
This bug was found and tracked down by Peter Chubb.
Signed-off-by: <davidm@hpl.hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ryan S. Arnold [Wed, 28 Jul 2004 15:59:52 +0000 (08:59 -0700)]
[PATCH] ppc64: HVCS driver
* include/asm-ppc64/hvcserver.h
New file added to wrap ppc64 architecture specific firmware calls for
use by HVCS. This file provides a struct hvcs_partner_info definition,
headers for partner info gathering and vterm connection and termination
interfaces.
* arch/ppc64/kernel/Makefile
Added build directive for hvcserver.o when HVCS is configured.
* arch/ppc64/kernel/hvconsole.c
Exported hvc_put_chars() and hvc_get_chars() for use by HVCS.
* arch/ppc64/kernel/hvcserver.c
Body of hvcserver module which accompanies the hvcs module and provides
ppc64 architecture firmware calls for use by HVCS. This file provides
function bodies for partner info gathering and vterm connection and
termination interfaces.
* drivers/char/Kconfig
Added CONFIG_HVCS option for both built-in version and module version
of hvcs.
* drivers/char/Makefile
Added build directive for hvcs.o when CONFIG_HVCS is configured.
* drivers/char/hvcs.c
This is the device driver for the IBM Hypervisor Virtual Console
Server, "hvcs". The IBM hvcs provides a tty driver interface to allow
Linux user space applications access to the system consoles of logically
partitioned operating systems, e.g. Linux, running on the same
partitioned Power5 ppc64 system. Physical hardware consoles per
partition are not practical on this hardware so system consoles are
accessed by this driver using inter-partition firmware interfaces to
virtual terminal devices.
* Documentation/powerpc/hvcs.txt
HVCS installation and usage documentation.
Thanks everyone for all the help with this driver [Andrew Morton, Paul
Mackerras, Ben Herrenschmidt, Dave Hansen, Paul Mackerras, Dave Boutcher,
Hollis Blanchard, Santiago Leon, Brian King, Randy Dunlap].
Signed-off-by: Ryan S. Arnold <rsa@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Joel Schopp [Wed, 28 Jul 2004 15:59:41 +0000 (08:59 -0700)]
[PATCH] ppc64 SMT bugfix
This patch is fairly straightforward. maxcpus should be per SMT thread and
not per physical processor. SUSE picked this up back in May (was discussed
on ppc64 mailing list) and has had no trouble with it.
Signed-off-by: Joel Schopp <jschopp@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
projects / linux / log