into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

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>

into kroah.com:/home/greg/linux/BK/usb-2.6

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>

The last argument in the PSCHED_TDIFF_SAFE is no longer used;
only usage eliminated by previous patch. It gets rid of a bad macro
usage.

Also, can use the standard min_t macro which also eliminates the
macro problem of double evaluation of bound.
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>

I don't think we're in K&R any more, Toto.

If you want a NULL pointer, use NULL. Don't use an integer.

Most of the users really didn't seem to know the proper type.

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.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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>

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>

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>

into nuts.davemloft.net:/disk1/BK/net-2.6

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>

I strongly recommend that this patch be applied.

Without this patch, running tcpdump on an SMP machine with the
pegasus adapter locks up 9 times out of 10.  This is what happens:

CPU0				CPU1
pegasus_start_xmit
	netif_stop_queue
				pegasus_set_multicast
					netif_stop_queue
					netif_wake_queue

Which crashes if another packet is sent to pegasus_start_xmit before
the first one is finished.

If there are other drivers doing this, please fix them too.

PS I submitted this to Petkan years ago but he probably lost it.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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?
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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. :-)


T:  Bus=04 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#=  2 Spd=480 MxCh= 0
D:  Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=0402 ProdID=5621 Rev= 1.03
S:  Product=USB 2.0 Storage Device
S:  SerialNumber=00042222200000113608
C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=  0mA
I:  If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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.

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>

into nuts.davemloft.net:/disk1/BK/net-2.6

Thanks to Gordon Elam <gbe@shoremicro.com> for the information needed
to do this.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Verify at least a full header is there before derefencing
length struct member.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

There are currently two files besides mm/vmalloc.c that make use of that
function:

- arch/sh/kernel/cpu/sh4/sq.c
  which defined its own prototype locally risking not being in sync with
  the real function, and

- arch/arm/kernel/module.c which has no prototype at all and cause
  build warnings.

This fixes those issues

remove extraneous security_inode_setattr call in hugetlbfs, it's already
done by VFS.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al's current changes to struct nameidata broke nfsroot for my discless
clients (oops in nfs_fill_super).  The patch below fixes this problem
for me.

Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

char can be either signed or unsigned, depending on the target system.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: David S. Miller <davem@redhat.com>

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>

CAP_DAC_OVERRIDE fails to give search permission in a directory with
mode 0.

Patch acked by Chris Wright <chrisw@osdl.org>
Signed-off-by: Andries Brouwer <aeb@cwi.nl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There's no reason to keep files that
a) nobody #include's
b) produce #error 
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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>

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>

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>

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=1671Signed-off-by: Zwane Mwaikambo <zwane@linuxpower.ca>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>