Tigran Aivazian [Tue, 29 Jun 2004 12:17:15 +0000 (05:17 -0700)]
[PATCH] fix to microcode driver for the old CPUs.
Here is a patch against Linux 2.6.7 which fixes the sigmatch() macro to
work for the relatively old processors as well, which have 'pf == 0'
(processor flags as read from MSR 0x17), For example, the processors
failing without this patch are Pentium II 300 MHz (Klamath) with
family/model/stepping 6/3/4 and 6/3/3.
The patch also contains minor cosmetic changes (to make source code more
uniform).
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Antonino Daplas [Tue, 29 Jun 2004 12:17:04 +0000 (05:17 -0700)]
[PATCH] fbcon: fix display artifacts
Fixed display artifacts present in the space reserved for the boot logo.
Use attributes of the background erase character instead of hardcoding the
color to zero.
Signed-off-by: Antonino A. Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Tue, 29 Jun 2004 12:16:41 +0000 (05:16 -0700)]
[PATCH] Provide console_suspend() and console_resume()
Add console_stop() and console_start() methods so the serial drivers
can disable console output before suspending a port, and re-enable output
afterwards.
We also add locking to ensure that we synchronise with any in-progress
printk.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Tue, 29 Jun 2004 12:16:30 +0000 (05:16 -0700)]
[PATCH] Provide console_device()
[This patch series has also been separately sent to the architecture
maintainers]
Add console_device() to return the console tty driver structure and the
index. Acquire the console lock while scanning the list of console drivers
to protect us against console driver list manipulations.
Signed-off-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
I am not exactly 100% sure I translated it correctly since I have no idea
what exactly was that NEC v850 evaluation board, but should be OK (say 95%
sure).
Acked by Miles Bader <miles@lsi.nec.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Yoav Zach [Tue, 29 Jun 2004 12:16:08 +0000 (05:16 -0700)]
[PATCH] binfmt misc fd passing via ELF aux vector
The proposed patch uses the aux-vector to pass the fd of the open misc
binary to the interpreter, instead of using argv[1] for that purpose.
Previous patch - open_nonreadable_binaries, offered the option of
binfmt_misc opening the binary on behalf of the interpreter. In case
binfmt_misc is requested to do that it would pass the file-descriptor of
the open binary to the interpreter as its second argument (argv[1]). This
method of passing the file descriptor was suspected to be problematic,
since it changes the command line that users expect to see when using tools
such as 'ps' and 'top'.
The proposed patch changes the method of passing the fd of the open binary
to the translator. Instead of passing it as an argument, binfmt_misc will
request the ELF loader to pass it as a new element in the aux-vector that
it prepares on the stack for ELF interpreter. With this patch, argv[1]
will hold the full path to the binary regardless of whether it opened it or
not.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andy Whitcroft [Tue, 29 Jun 2004 12:15:56 +0000 (05:15 -0700)]
[PATCH] ppc64: fix deadlocks when oopsing while mmap_sem is held
If a fault in the kernel leads to an unexpected protection fault whilst in
a code path which holds mmap_sem we will deadlock in do_page_fault() while
trying to classify the fault. By carefully testing the source of the fault
we can detect and OOPS on the vast majority of these, greatly enhancing
diagnosis of such bugs.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton [Tue, 29 Jun 2004 12:15:45 +0000 (05:15 -0700)]
[PATCH] x86_64 .init.setup alignment fix
We're now putting 24-byte structures into .init.setup via __setup. But
x86_64's compiler is emitting a `.align 16' in there, so they end up on
32-byte boundaries and do_early_param()'s pointer arithmetic goes wrong.
Fix that up by forcing the compiler to align these structures to sizeof(long).
[BRIDGE]: Fix message age in bridge STP config packets.
This is a revised version of Kishore's patch to set message age appropriately
in STP configuration packets.
Signed-off-by: Kishore A K <KishoreAK@myw.ltindia.com> Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@redhat.com>
Tony Luck [Tue, 29 Jun 2004 08:52:46 +0000 (01:52 -0700)]
[PATCH] ia64: fix reloc-out-of-range error on module loading
I'm hitting this problem because the module I want to load was
compiled with -g, so the filesize is absolutely huge. kernel/module.c
does a vmalloc() to inhale the entire file, and then two calls to
module_alloc() (which calls vmalloc() on ia64) to load the 'init' and
'core' sections. The 'init' is small and slips into a gap early in the
vmalloc playspace, while the 'core' area is allocated after the huge
area that was allocated for the inhaled copy of the whole file.
I made a one coding change to Jean-Marc's version, adding a check to
see whether the init/core sections are close enough together for the
PCREL21B to reach (they almost always are).
I've kept the test that there are no jumps from core to init (though
the message that is printed is almost as unhelpful as the one that you
get when you statically link a module into the kernel that has calls
to the discarded .exit section :-)
This patch stalled out before on the question of whether a PLT was
overkill for a section-to-section branch, and whether it would be
better to use relaxation techniques to extend the range. Doing that
might be more elegant in some way, but it needs a whole heap of extra
code (to count how many relaxed branches need to be added and
allocated them as needed). This seems a lot of extra code that is
only ever going to be exercised by maniacs like me with 49MB .ko
files.
I fixed up the comments to be a little more heplful.
Signed-off-by: <tony.luck@intel.com> Signed-off-by: David Mosberger <davidm@hpl.hp.com>
Jesse Barnes [Tue, 29 Jun 2004 07:47:36 +0000 (00:47 -0700)]
[PATCH] ia64: update early printk for new console driver
The Altix console driver has been replaced in Andrew's tree by a new
one that uses the serial core API. Update the early_console_setup
routine to use the new config option so that it's ready when the
driver hits Linus' tree. This will also fix a build bug since the old
driver hasn't been updated.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: David Mosberger <davidm@hpl.hp.com>
The packet scheduler simulates 64 bit jiffies on 32 bit platforms by running
a timer keeping a mark and and offset. Since there is no locking and this is
racy and doesn't handle jiffie wrap real well.
We can use get_jiffies_64 on 2.6 do get what is needed.
The downside is the overhead of a function call, and a cache miss in
get_jiffies_64.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@redhat.com>
This code in the csz scheduler, is just plain broken. The TDIFF_SAFE
effectively expands to:
unsigned long delay = now - q->t_c;
if (delay > 0) {
delay = 0;
goto do_reset;
}
if (delay >> q->delta_log)
So delay is always 0! I assume that what was originally intended
is the to keep delay bounded to 1<<q->delta_log.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@redhat.com>
Kenneth W. Chen [Tue, 29 Jun 2004 07:36:05 +0000 (00:36 -0700)]
[PATCH] ia64: fix incorrect initialization of ar.k4 for BP
The patch to move the current pointer for init_task from region 7 to
region 5 inadvertendly caused ar.k4 (CURRENT_STACK) to be initialized
improperly for the bootstrap processor. Fix this by initializing it
to -1.
Signed-off-by: David Mosberger <davidm@hpl.hp.com>
USB: fix bug where removing usb-serial modules or usb serial devices could oops
This fixes the issue where the Generic driver would bind to all usb-serial
devices, so the disconnect would not properly go to the real driver that
controlled the device. This was very bad when unloading the module with
the device still connected.
The packet scheduling code has some ugly define's which were to deal with
configuration possibilities and the old style module exports. With the current
2.6 method, this is unnecessary.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@redhat.com>
Dmitry Torokhov [Tue, 29 Jun 2004 07:25:48 +0000 (00:25 -0700)]
[PKT_SCHED]: Compile warning and logic rearrangement in sch_prio enqueue.
When CONFIG_NET_CLS_ACT is not set 'result' variable in prio_classify is
unused. Also I was looking over the rest of the module and had hard time
understanding the logic in prio_enqueue - I rearranged it a bit for better
readability. Plus there are some formatting changes.
Signed-off-by: Dmitry Torokhov <dtor_core@ameritech.net> Signed-off-by: David S. Miller <davem@redhat.com>
Jamal Hadi Salim [Tue, 29 Jun 2004 07:20:59 +0000 (00:20 -0700)]
[NET]: Two tc action fixes.
Another patchlet after turning on preempt and rerunning tests.
- against dev.c is a genuine bug - i wish preempt would have
given a more sane hint. Strange on how its a non issue when preempt is
off.
- against act_api.c is just an annoyance. I removed the kmod because it
will only make sense to list actions if policies exist for that action.
And if policies exist, the module would be loaded.
Signed-off-by: Jamal Hadi Salim <hadi@zynx.com> Signed-off-by: David S. Miller <davem@redhat.com>
Kenneth W. Chen [Tue, 29 Jun 2004 07:14:57 +0000 (00:14 -0700)]
[PATCH] ia64: change ia64_switch_mode_{phys,virt}() to preserve bsp/sp
Change ia64_switch_mode_phys() and ia64_switch_mode_virt() to preserve
the virtual sp/bsp and update the call-sites accordingly. This avoids
problems with the init_task pointer which lives in region 5 now.
Signed-off-by: David Mosberger <davidm@hpl.hp.com>
H. J. Lu [Tue, 29 Jun 2004 06:33:25 +0000 (23:33 -0700)]
[PATCH] ia64: Don't use -mtune=merced for gcc 3.4
Gcc 3.4 has a new DFA scheduler for ia64. Unfortunately, it is not
well tested for Itanium 1. When I tried to use gcc 3.4 to compile
2.6 kernel configured for Merced, gcc failed in many places:
Some of them have been fixed. But I am afraid many more remain. I don't
know how many Itanium 1 machines left in production use. If people want
to optimize kernel for Itanium 1, they can stick with the older gccs.
Or they should upgrade their machines. I think the gcc developer's time
should be better spent on somewhere else. I have been using this patch
for a while, kernel seems to work OK.
Signed-off-by: David Mosberger <davidm@hpl.hp.com>
Alan Stern [Tue, 29 Jun 2004 02:50:46 +0000 (19:50 -0700)]
[PATCH] USB Storage: Unusual_devs.h update
On Sat, 26 Jun 2004, Edward C. Bailey wrote:
> Hello,
>
> I was downloading some pictures from my Digital Wallet to my Fedora
> Core 2 system at the same time I happened to be watching
> /var/log/messages. Here's what I saw:
>
> Jun 26 12:16:02 raptor kernel: usb 1-1.2: new full speed USB device using address 6
> Jun 26 12:16:02 raptor kernel: usb-storage: This device (097a,0001,0001 S 06 P 01) has unneeded SubClass and Protocol entries in unusual_devs.h
> Jun 26 12:16:02 raptor kernel: Please send a copy of this message to <linux-usb-devel@lists.sourceforge.net>
>
> Given that Minds@Work are out of business, you might not care about this
> information, but I thought I'd pass it on, just in case you do... :-)
What the heck, we'll use it anyway. Thanks for sending this in.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Andrew Morton [Tue, 29 Jun 2004 02:48:16 +0000 (19:48 -0700)]
[PATCH] USB: pwc-uncompress.h
For some reason, gcc-2.95.4 dies horridly on those asmlinkage
declarations.
I was unable to work out _why_ those functions have asmlinkage, as there
seem to be no instances of them - nobody calls
pwc_register_decompressor().
What's up with that?
Torsten Scherer [Tue, 29 Jun 2004 02:46:24 +0000 (19:46 -0700)]
[PATCH] USB Storage: unusual_devs.h addition
took me a while to get my external usb drive running under linux-2.6.6,
appears to need the appended fix. according to the header in unusual_devs.h
one should send them to you, so here you go.
the funny thing is that it works fine unter linux-2.6.0-test11 on different
hardware, but then i'm out of my depth concerning what might have been
changed in the usb driver in the meantime. i don't really follow the
changes. i didn't find any real documentation about what these flags do,
only a couple of "my usb drive worked with 2.4 but doesn't work any more
with 2.6" messages on the web, and some of them pointed to unusual_devs.h. i
do not claim to know what i've done with this fix, but i'd like to see it
officially included. :-)
[PATCH] Remove NOOP code from fs/buffer.c::drop_buffers()
I noticed that fs/buffer.c::drop_buffers() contains some code that
AFAICS doesn't actually do anything other than waste cpu cycles so here
is patch to remove it... The local variable was_uptodate is being
messed with but it is not being read anywhere so it seems entirely
pointless.
I assume this must be a remainder from old code which mucked around with
the page uptodateness but which has since been (re-)moved.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
efi.h declares a function type, and then uses that as an argument to
another function, and expects the compiler to magically demote the
function to a function pointer.
Even a gcc person (rth) was surprised that this was legal, and it
doesn't match any other use of a function pointer in the kernel, and
sparse doesn't like the implicit type-conversion.
So make the type sane in the first place, instead of depending on
a very weird corner case of the C language.
Paul Mackerras [Tue, 29 Jun 2004 02:34:04 +0000 (19:34 -0700)]
[PATCH] ppc64: fix memset
This fixes a bug in the ppc64 memset where the code that gets the
destination address aligned (or is supposed to) was looking at the
bottom 3 bits of the count rather than the destination address. The
result of this was that the kernel wouldn't boot on POWER3 machines.
The patch also removes an unnecessary duplicate instruction.
Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
[AIO]: kiocb->private is too large for kiocb's on-stack.
sizeof(struct kiocb) is dangerously large for a structure commonly
allocated on-stack. This patch converts the 24*sizeof(long) field,
->private, to a void pointer for use by file_operations entrypoints.
A ->dtor() method is added to the kiocb in order to support the release
of dynamically allocated structures referred to by ->private.
The sole in-tree users of ->private are async network read/write,
which are not, in fact, async, and so need not handle preallocated
->private as they would need to if ->ki_retry were ever used. The sole
truly async operations are direct IO pread()/pwrite() which do not
now use ->ki_retry(). All they would need to do in that case is to
check for ->private already being allocated for async kiocbs.
This rips 88B off the stack on 32-bit in the common case.
Signed-off-by: William Lee Irwin III <wli@holomorphy.com> Signed-off-by: David S. Miller <davem@redhat.com>
Andy Whitcroft [Sun, 27 Jun 2004 16:35:21 +0000 (09:35 -0700)]
[PATCH] fix GFP zone modifier interators
For each node there are a defined list of MAX_NR_ZONES zones. These are
selected as a result of the __GFP_DMA and __GFP_HIGHMEM zone modifier flags
being passed to the memory allocator as part of the GFP mask. Each node
has a set of zone lists, node_zonelists, which defines the list and order
of zones to scan for each flag combination. When initialising these lists
we iterate over modifier combinations 0 .. MAX_NR_ZONES. However, this is
only correct when there are at most ZONES_SHIFT flags. If another flag is
introduced zonelists for it would not be initialised.
This patch introduces GFP_ZONETYPES (based on GFP_ZONEMASK) as a bound for
the number of modifier combinations.
Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alan Cox [Sun, 27 Jun 2004 16:35:10 +0000 (09:35 -0700)]
[PATCH] vc locking
Like a few other drivers the vc driver is doing unlocked careless
references to file offsets. Its got kind of 2.2 locking that hasnt been
updated in the lseek function so someone at least tried.
Fortunately we have a real lock for this and can just make lseek use that
too.
The 'assume 64bit load is atomic' bug seems to be very widely spread
akpm@osdl.org:
Move declarations to vt_kern.h
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Eger [Sun, 27 Jun 2004 16:34:58 +0000 (09:34 -0700)]
[PATCH] radeonfb accel capabilities
Here's the accel capabilities patch for radeonfb. It updates radeonfb to
advertise its acceleration capabilities via fbinfo.flags. I've tested this
on my box, and it gives me a nice fast console.
defect: "$ fbset -accel 0" doesn't work for radeonfb -- disabling accel
will only work from the kernel command line :-/
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.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>
Zwane Mwaikambo [Sun, 27 Jun 2004 16:34:47 +0000 (09:34 -0700)]
[PATCH] Fix smbfs readdir oops
This has been reported a couple of times and is consistently causing some
folks grief, so Urban, would you mind terribly if i send this patch to at
least clear current bug reports. If there is additional stuff you want
ontop of this let me know and i can send a follow up patch.
The bug is that at times we haven't completed setting up the smb_ops so we
have a temporary 'null' ops in place until the connection is completely up.
With this setup it's possible to hit ->readdir() whilst the null ops are
still in place, so we put the process to sleep until the connection setup
is complete and then call the real ->readdir().
This patch addresses the bugzilla report at
http://bugzilla.kernel.org/show_bug.cgi?id=1671
Signed-off-by: Zwane Mwaikambo <zwane@linuxpower.ca> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andy Whitcroft [Sun, 27 Jun 2004 16:34:24 +0000 (09:34 -0700)]
[PATCH] ia32: fix deadlocks when oopsing while mmap_sem is held
If a fault in the kernel leads to an unexpected protection fault whilst in
a code path which holds mmap_sem we will deadlock in do_page_fault() while
trying to classify the fault. By carefully testing the source of the fault
we can detect and OOPS on the vast majority of these, greatly enhancing
diagnosis of such bugs.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Stephen Rothwell [Sun, 27 Jun 2004 04:17:10 +0000 (21:17 -0700)]
[PATCH] PPC64 iSeries fails to boot
Jeremy Katz of Red Hat reported that his iSeries machine would not boot
with 2.6.7 based kernels.
It appears that with the inclusion of Paul Mackerras' patch "Optimize
exception/syscall entry/exit" a small previous patch got reverted. Here
is that patch again. The lack of this patch does not stop all iSeries
machines booting, but it does stop some.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton [Sun, 27 Jun 2004 04:02:48 +0000 (21:02 -0700)]
[PATCH] ext3: direct-io transaction extending fix
ext3_direct_io_get_blocks() is misinterpreting the return value from
ext3_journal_extend(), and is consequently running out of buffer credits and
going BUG on tremendously large direct-io writes. Fix that up.
Also, I note that the really large direct-io writes can hold a transaction
open for the entire duration, which can be minutes. This violates ext3's
attempt to commit data at regular intervals. Fix that up by looking at the
transaction state: if it's T_LOCKED, shut off the current handle so the
pending commit can complete.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jesper Juhl [Sun, 27 Jun 2004 04:02:26 +0000 (21:02 -0700)]
[PATCH] cpufreq_delayed_get() inlining fix
Here's a patch to reorder timer_tsc.c so gcc 3.4 does not fail to inline
and thus fix the warning "arch/i386/kernel/timers/timer_tsc.c:30: warning:
inlining failed in call to 'cpufreq_delayed_get': function body not
available"
Hugh Dickins [Sun, 27 Jun 2004 04:02:14 +0000 (21:02 -0700)]
[PATCH] anon_vma list locking bug
Vladimir Saveliev reported anon_vma_unlink list_del BUG (LKML 24 June).
His testing is still in progress, but we believe it comes from a nasty
locking deficiency I introduced in 2.6.7's anon_vma_prepare.
Andrea's original anon_vma_prepare was fine, it needed no anon_vma lock
because it was always linking a freshly allocated structure; but my
find_mergeable enhancement let it adopt a neighbouring anon_vma, which of
course needs locking against a racing linkage from another mm - which the
earlier adjust_vma fix seems to have made more likely.
Does anon_vma->lock nest inside or outside page_table_lock? Inside, but
that's not obvious without a lock ordering list: instead of listing the
order here, update the list in filemap.c; but a separate patch because
that's less urgent and more likely to get wrong or provoke controversy.
(Could do it with anon_vma lock after dropping page_table_lock, but a long
comment explaining why some code is safe suggests it's not.)
Luiz Capitulino [Sun, 27 Jun 2004 04:02:03 +0000 (21:02 -0700)]
[PATCH] drivers/char/ipmi/ipmi_si_intf.c warnings
drivers/char/ipmi/ipmi_si_intf.c: In function `acpi_gpe_irq_setup':
drivers/char/ipmi/ipmi_si_intf.c:1173: warning: passing arg 4 of `acpi_install_gpe_handler' from incompatible pointer type
drivers/char/ipmi/ipmi_si_intf.c: In function `acpi_gpe_irq_cleanup':
drivers/char/ipmi/ipmi_si_intf.c:1193: warning: passing arg 3 of `acpi_remove_gpe_handler' from incompatible pointer type
Pavel Machek [Sun, 27 Jun 2004 04:01:52 +0000 (21:01 -0700)]
[PATCH] swsusp.S: meaningful assembly labels
This introduces meaningfull labels instead of .L1234, meaning code is
readable, kills alignment where unneccessary, and kills TLB flush that was
only pure paranoia (and slows it down a lot on emulated systems).
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bart Samwel [Sun, 27 Jun 2004 04:01:41 +0000 (21:01 -0700)]
[PATCH] Laptop mode control script improvements
From: Herve Eychenne <rv@eychenne.org>
Clean up the script. This also makes it two times faster. (Thanks to
Herve Eychenne.)
- moved variable definitions to the top, for easier configuration
- the script contains bashisms, so make it /bin/bash
- use sed -e'...' -e '...' instead of sed | sed
- avoid subshells: () changed to {}
- various other minor optimizations and improvements
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bart Samwel [Sun, 27 Jun 2004 04:01:19 +0000 (21:01 -0700)]
[PATCH] laptop-mode documentation update
The laptop mode docs don't say that no kernel configuration changes are
needed to use laptop mode. That's caused some people to look for the
option. This patch makes the doc explicitly mention the lack of an option.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paul Fulghum [Sun, 27 Jun 2004 04:01:08 +0000 (21:01 -0700)]
[PATCH] ppp_generic.c get_filter made conditional
Add #ifdef CONFIG_PPP_FILTER around get_filter implementation which is only
used when this option is enabled. This prevents compiler warning (unused
function) when CONFIG_PPP_FILTER is not defined.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Martin J. Bligh [Sun, 27 Jun 2004 04:00:45 +0000 (21:00 -0700)]
[PATCH] fix NUMA boundaray between ZONE_NORMAL and HIGHMEM
From: Andy Whitcroft <apw@shadowen.org>
This patch eliminates the false hole which can form between ZONE_NORMAL and
ZONE_HIGHMEM. This is most easily seen when 4g/4g split is enabled, but
it's always broken, and we just happen not to hit it most of the time.
Basically, the patch changes the allocation of the numa remaps regions (the
source of the holes) such that they officially fall within VMALLOC space,
where they belong.
Tested in -mjb for a couple of months, and again against 2.6.7-mm1.
Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Martin J. Bligh <mbligh@aracnet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Kenneth W. Chen [Sun, 27 Jun 2004 04:00:34 +0000 (21:00 -0700)]
[PATCH] Fix direct I/O into hugetlb page
Hit a kernel oops on 2.6.7 kernel when doing direct I/O to hugetlb page.
The destructor of compound page was moved into page->mapping since 2.6.6.
It got interfered with set_page_dirty() for hugetlb page: an O_DIRECT read
into first tail page of the compound page will fool set_page_dirty() to
deference page->mapping->a_ops and then kernel oops. Patch to fix the
oops. We do just like what bio_set_pages_dirty() does.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
projects / linux / log