[parisc-linux] 2.4.20-rc1

[parisc-linux] 2.4.20-rc1

[Matthew Wilcox]

ok, HEAD is now based on 2.4.20-rc1.  There's three things I wasn't 100%
sure of during the merge:

(1) drivers/pci/setup-bus.c.  It looks like most of, but not all, the
changes in our tree were merged into 2.5.20-rc1.  I've basically taken
the version we had in 2.4.19 but other changes may be needed.  Grant,
can you look at this?

(2) arch/parisc/kernel/syscall.S.  2.4.20-rc1 removed our XFS syscalls..
tausq, can you look at this?

(3) include/asm-parisc/ide.h.  2.4.20-rc1 removed some definitions from
this file that weren't removed from asm-i386, so i put them back.  Alan,
I presume this was your doing?

-- 
Revolutions do not require corporate support.

[parisc-linux] Re: 2.4.20-rc1

[Alan Cox]

On Wed, 2002-11-13 at 15:32, Matthew Wilcox wrote:
> (3) include/asm-parisc/ide.h.  2.4.20-rc1 removed some definitions from
> this file that weren't removed from asm-i386, so i put them back.  Alan,
> I presume this was your doing?

Not me AFAIK. The IDE in -ac is seperate so doesnt get merged

Re: [parisc-linux] 2.4.20-rc1

[Grant Grundler]

Matthew Wilcox wrote:
> (1) drivers/pci/setup-bus.c.  It looks like most of, but not all, the
> changes in our tree were merged into 2.5.20-rc1.  I've basically taken
> the version we had in 2.4.19 but other changes may be needed.  Grant,
> can you look at this?

I was re-reading this a few times and assumed you meant 2.4.20-rc1.
I'm looking at "cvs diff -r LINUS_2420RC1 drivers/pci/setup-bus.c" output.

The primary difference is for bridge_ctl field. rmk posted the
bridge_ctl patch for 2.5 and it makes managing VGA, FBB, PERR,
SERR bits in cmd register possible per arch.
I'd like to keep this in our tree since we want SERR/PERR *on*
and PC folks in general don't. And parisc really doesn't want
anything to do with VGA stuff...I don't see any reason why this
change doesn't go back to marcello.

The second significant difference is pbus_assign_resources_sorted()
wants to disable all devices while assigning resources. Not a good
thing for our console. I trust PDC to assign sane values to all devices
whether or not all devices are initially configured or enabled.
We don't have to worry about overlapped MMIO ranges or such crap
during later resource assignments.

*sigh* I see "ifndef __hppa__" here (should be CONFIG_PARISC).

We can adopt changes in pci_bridge_check_ranges(), pbus_size_io(),
and pbus_size_mem(). You want to do those or should I?

Anyone, once this is "cleaner", I think ivan/rmk/~r/helgaas probably
want to review the bridge_ctl diff before you submit to marcello.

hth,
grant