Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Resolve merge conflicts.
ia64: Update defconfigs.
[IA64] clean up ptrace corner cases
Patch from yanmin.zhang@intel.com to fix up some corner cases
in ptrace. Many thanks to davidm for reviewing and improving.
Backported to 2.4 by Bjorn Helgaas (bjorn.helgaas@hp.com).
[IA64] Sanity check unw_unwind_to_user
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
ia64: add missing syscall-slot.
Merge to 2.4.29
ia64: fix perfmon typo in /proc/pal/CPU*/processor_info w.r.t. BERR
Initially reported by Danny Kwong from HP.
Signed-Off-By: stephane eranian <eranian@hpl.hp.com>
Signed-Off-By: Bjorn Helgaas <bjorn.helgaas@hp.com>
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
ia64: Fix _PAGE_CHG_MASK so PROT_NONE works again. Caught by Linus.
Fix pte_modify() bug which allowed mprotect() to change too many bits.
Found by Russell King.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
ia64: round iommu allocations to power-of-two sizes.
Round IOVA allocations to power-of-two sizes to avoid
REO/Grande defect AR2305.
[PATCH] ia64: force all kernel sections into one and the same segment
Older versions of the linker do not handle cross-segment segment-relative
relocations properly. This becomes a real problem when the linker decides
to put .text and .text.init into different segments (for whatever reasons)
because in that case, broken linkers will produce a broken unwind section,
which can cause nasty Heisenbugs, where, for example, unwinding may or may
not work depending on the exact value of the IP in a function.
[Backport of Keith Owens' 2.6 change]
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4.26
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Cset exclude: bjorn.helgaas@hp.com|ChangeSet|20040303223612|45191
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4.25
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
hand merge
hand merge
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Fix SUBLEVEL typo.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
agpgart: Fix HP ZX1 AGP 8X bridge support.
fix up sx1000 init function merge.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Hand merge: Update hugetlb merge.
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
ia64: Fix broken merge (remove mmu_gathers[] defn)
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Trivial hand merge
ia64: Fix system type selection to workaround menuconfig bug (select "HP",
get "HP-simulator").
ia64: Clean up system type selection help text.
ia64: hugepage_free_pgtables() bug-fix
When there are two huge page mappings, like the two in the example
below, first one at the end of PGDIR_SIZE, and second one starts at
next PGDIR_SIZE (64GB with 16K page size):
8000000ff0000000-8000001000000000 rw-s
8000001000000000-8000001010000000 rw-s
Unmapping the first vma would trick free_pgtable to think it
can remove one set of pgd indexed at 0x400, and it went ahead
purge the entire pmd/pte that are still in use by the second
mapping. Now any subsequent access to pmd/pte for the second
active mapping will trigger the bug. We've seen hard kernel
hang on some platform, some other platform will generate MCA,
plus all kinds of unpleasant result.
[PATCH] ia64: ia32 sigaltstack() fix
The attached patch fixes a bug introduced by the earlier patch to
handle the differences between ia32 and ia64 in the definition of
MINSIGSTKSZ.
[PATCH] ia64: fix ia64_ctx.lock deadlock
I hit a deadlock involving the ia64_ctx.lock. The lock
may be taken in interrupt context to process an IPI from smp_flush_tlb_mm.
[PATCH] ia64: Avoid double clear of CMC/CPE records
Credit to Ben Woodard <ben@zork.net>.
[PATCH] ia64: enable recovery from TLB errors
Here's the updated version of the MCA TLB recovery patch.
[PATCH] ia64: fix deadlock in ia64_mca_cmc_int_caller()
smp_call_function() must not be called from interrupt context (can
deadlock on tasklist_lock). Use keventd to call smp_call_function().
Merge
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/to-marcelo-2.4
ia64: work around a menuconfig bug.
Re-order "HP" and "HP-simulator" to workaround menuconfig bug. If "HP-simulator"
appears first, menuconfig selects it when the user selects "HP".
Hand-merge makefile revision
Hand-merge Makefile revision
ia64 HP iommu: add "sx1000" detection (no functional change).
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
ia64: Fix PFM_WRITE_PMCS failure in system-wide mode when PMC12 is zero
- fixes a typo in pfm_write_pmcs() by which we were not using the
correct index variable to check for the default value of a PMC.
This caused calls to PFM_WRITE_PMCS to fail in system wide mode
when PMC12 is programmed to be zero.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Hand merge ACPI power off update.
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
ACPI: Fix acpi_bus_add() error that caused some devices to be erroneously ignored.
This caused the CBN PCI root bridge on ia64 i2000 boxes to be ignored. This
is where the AGP bridge lives.
Hand merge for agpgart updates.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Adapt "prefer X_DSDT over DSDT" to struct changes.
This patch adds a "dev" parameter to drm_ioremap(), drm_ioremap_nocache(),
and drm_ioremapfree(). This change is already in 2.5, and is required to
support DRM on ia64.
The problem on ia64 is that CPU addresses don't get remapped by the
GART, so we have to fiddle with the kernel page tables, and the
ioremap interfaces need the dev pointer to do that.
This part is strictly interface changes; the actual use of the new
parameter is messier code that I'll send separately. The changes
below should be straightforward enough to be fairly non-controversial.
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
qla1280: exclude SGI SN2 code for generic builds for now (doesn't compile).
fs/Config.in: Fix merge errors.
Hand-merge DRM and qla1280 updates.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Trivial hand merge.
Trivial hand merge.
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
AGPGART: Don't include asm/msr.h unless CONFIG_AGP_NVIDIA.
HUGETLBFS: clean up config options
Hugetlbfs is not module'able at current state, so tristate the "HugeTLB
file system support" option is kind of silly. Also, at present you can
set CONFIG_HUGETLB_PAGE and not CONFIG_HUGETLBFS, which give the kernel
low-level hugepage support, but no userspace API to access it is also
kind of silly.
While I'm at it, here is a patch that flips dependency around:
CONFIG_HUGETLB_PAGE mirrors CONFIG_HUGETLBFS option and hugetlb page
size selection appear/disappear depending on whether hugetlbfs is
selected or not. (this is taken from 2.6).
HUGETLBFS: fix mount error paths
Here is a patch that fixes a rather nasty bug in hugetlbfs. If root
tries to mount a hugetlbfs with invalid mount option,
hugetlbfs_fill_super incorrectly returns error code instead of NULL on
couple error conditions, causing generic vfs layer to segfault and took
some semaphore with it, the end result is kernel hang on any subsequent
file system mount/unmount. There are some other cases that has memory
leak upon error conditions.
HUGETLBFS: quota bugfix and sync to 2.6.
Here is a bug fix patch relative to latest Bjorn's 2.4 ia64 kernel tree.
Mainly sync up hugetlbfs code w.r.t latest 2.6.
Hugetlb file system quota was incorrectly taken on every mmap even for
the case that huge pages has been already allocated on the file inode.
This results in taxing the same hugepage multiple times and causing mmap
to fail on existing file when quota mistakenly runs out. This patch also
fixes file size to account holes.
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
AGP: (agp_allocate_memory): Replace agp_lookup_pte() with vmalloc_to_page().
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Remove qla2100 driver. Nobody seems to use this old one from the ia64
patch anyway.
DRM: Whitespace cleanup to match 2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
AGPGART: Remove duplicated code from upstream merge.
Hand merge since Marcelo accepted AGP updates.
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Hand merge.
(pci_generic_prep_mwi): Don't export this; it's conditionally compiled.
Move IA64 simulator drivers to arch/ia64/drivers/
Merge with AA mem changes.
DRM: Add "dev" parameter to new DRM_IOREMAP_NOCACHE() interface.
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Hand merge (need reinspection).
hand merge.
SERIAL: Clean up acpi_bus.h include path.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Remove an obsolete CONFIG_IA64_SGI_SN1 reference and drivers/net/wan/8253x/build
(a generated file).
Remove extra diffs left over from the ACPI update (IA64 carried around
a newer ACPI for a long time before 2.4 adopted it).
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
AGPGART: ia64: Rework for ACPI update and add HWP0007 support.
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Hand merge (because hugetlb is in ia64-extras).
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Hand merge (acpi_irq_to_vector patch accepted upstream).
[PATCH] drivers/char/mem.c cleanup
From: David Mosberger <davidm@napali.hpl.hp.com>
Here is a simplified version of the earlier /dev/mem cleanup. This version
of the patch no longer pretends to support uncached accesses via
read()/write(). Instead, all it does is:
- consolidate much of the ugly code in uncached_access()
- move pgprot_noncached() macro to pgtable.h for i386, m68k, ppc, ppc64,
and x86_64
- fix the ia64 implementation to use efi_mem_attributes() to determine
the cacheability of an address
Eventually, we may want to replace the #ifdef CONFIG_IA64 with #ifdef
CONFIG_EFI, but we can do this "on demand", if and when EFI-based x86
machines become more common.
(Backported to 2.4 by Bjorn Helgaas).
Hand merge (upstream incorporated the acpi_irq_to_vector change)
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
HUGETLB: remove bogus "extern" decls to satisfy gcc-3.4.
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge
discontig/NUMA support
Attached is the patch for discontig memory for 2.4.21. This patch
has been tested on the ZX1 & NEC platforms & appears to work ok. It
also works on SN2 but there are additional patches (unrelated to
discontig) that at still needed in 2.4.21.
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge
Merge
(acpi_get_table_header_early): Prefer X_DSDT over DSDT, if it exists.
SERIAL_ACPI: add support for UARTs in IO port space.
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
SERIAL_ACPI: minor reorganization to follow 2.6.
ACPI: Remove acpi_pci_get_translations() and support. pcibios_scan_root()
should walk the _CRS if necessary.
HP PCI IDs: Add PCI root bridge, rename PCI-X and AGP root bridge.
(acpi_os_install_interrupt_handler, acpi_os_remove_interrupt_handler):
Use acpi_irq_to_vector() rather than gsi_to_vector(). The
interrupt might be an ISA IRQ, not a GSI.
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
ia64: (acpi_register_irq): Rename argument to follow 2.5.
ia64: Fix ACPI interrupt polarity/trigger interpretation
It seems that acpi_register_intr (in arch/ia64/kernel/acpi.c)
takes an interrupt polarity/trigger in opposite way.
Attached patch fixes this. Please apply.
drivers/acpi/resource/rsirq.c decodes ACPI extended irq
resource and stores in edge_level and active_high_low members
of a structure (BTW, I think the names of these members
are source of confusion ;).
And this logic in acpi.c inverts both polarity and trigger.
vector = iosapic_register_intr(gsi,
polarity ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
mode ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
ACPI -> rsirq.c -> serial.c -> acpi.c -> iosapic.c
High 0 0 0 IOSAPIC_POL_LOW
Low 1 1 1 IOSAPIC_POL_HIGH
Edge 1 0 0 IOSAPIC_LEVEL
Level 0 1 1 IOSAPIC_EDGE
As ACPI_ACTIVE_{HIGH,LOW} and ACPI_{LEVEL,EDGE}_SENSITIVE are
defined in acpi subsystem, it should be safer to use these symbols.
ACPI: (acpi_power_off): for non-x86, use 0x20030714 code. (It used to depend on
acpi_suspend(), which is currently x86-only.)
Merge
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
into hp.com:/home/helgaas/linux/linux-ia64-2.4
SERIAL: add documentation and error checking for serial port discovery via ACPI.
CONFIG_SERIAL_HCDP documentation and indent fix.
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
Merge hp.com:/home/helgaas/linux/linux-2.4
into hp.com:/home/helgaas/linux/ia64-extras
HUGETLB: change SYSCTL number to match 2.5.
ia64: PAL_HALT_LIGHT config merge (+ auto merges).
Merge hp.com:/home/helgaas/linux/ia64-extras
into hp.com:/home/helgaas/linux/linux-ia64-2.4
Hand-merge ACPI Configure.help stuff (+ auto merges).
Resolve nvidia/intel 460gx merge conflicts.
[PATCH] ia64: Use PAL_HALT_LIGHT in cpu_idle
(Configure.help update).
Merge to newer ACPI CA.
Merge to newer ACPI CA.
HUGETLB: Add dummy is_invalid_hugepage_range() declaration for i386 build.
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
HUGETLBFS: Include slab.h for kmalloc proto.
HUGETLB: Add uid, gid, mode, size and nr_inodes mount support and file attributes.
Please find attached an update to the hugetlb page patch for your
2.4.21 bk tree. This patch incorporates the support for uid, gid,
mode, size and nr_inodes on the mount command line for hugetlb
filesystems. It also incorporates the support of setting the correct
attributes to files in hugetlbfs.
Most part of this code is already in Linus' bk tree for 2.5.71. The
remaining part (incorporating size option should also get in soon).
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Add Documentation/vm/hugetlbpage.txt from 2.5.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge bk://lia64@bkbits.net/linux-ia64-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Allow build with CONFIG_HUGETLB_PAGE=n.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Whitespace cleanup from hugetlb patch.
Hugetlb support for ia64.
Please find attached a hugetlb page patch for 2.4.20 kernel. This
patch is very close to the current hugepage support in 2.5 base (and
RH and SuSE) kernels. Little testing on this patch is done.
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Move mmu_gathers[] to local_cpu_data on ia64.
This is a patch that moves mmu_gathers into local_cpu_data on IA64 NUMA.
I'm not exactly sure where to push this patch, because it does touch
include/asm-generic/tlb.h although it has no effect on non ia64 arches.
The main reason for making this change is that the mmu_gathers array
gets very large as the number of processors increases.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Move UP cpu_online definition to <linux/smp.h>.
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge Dell.com:/home/helgaas/bk/to-marcelo-2.4
into Dell.com:/home/helgaas/bk/linux-ia64-2.4
ia64: Use printk severity-levels where appropriate.
Triggered by analysis done by Philipp Marek.
(Ported from 2.5 change by Bjorn Helgaas).
(Simulator drivers aren't under arch/ia64 in 2.4).
Make "duplicate PCI device" problem x86-specific (interim solution).
Ignoring adapters if we've already seen the same bus/devfn breaks
things if we have multiple PCI domains. If the HP LH4 problem
still exists, is should be handled in the x86 PCI code, not in
the driver.
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge
[PATCH] ia64: iosapic: self-documenting polarity/trigger arguments
Make interrupt registration functions take named constants for
polarity and trigger mode. Old -> new magic decoder ring:
polarity 0 -> IOSAPIC_POL_LOW (#defined to 1)
polarity 1 -> IOSAPIC_POL_HIGH (#defined to 0)
trigger 0 -> IOSAPIC_LEVEL (#defined to 1)
trigger 1 -> IOSAPIC_EDGE (#defined to 0)
[PATCH] ia64: iosapic: remove find_iosapic duplication
(Fixup acpi_register_irq(), which goes along with some non-ia64 changes).
Merge
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
AGPGART: Workaround for gcc-3.2.2 defect on ia64.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Cset exclude: bjorn_helgaas@hp.com|ChangeSet|20030213180817|62620
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
ia64 HP iommu: add "sx1000" detection (no functional change).
Make ACPI hot-plug controller detection check _CID in adddition to _HID.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
serial: Add discovery via ACPI namespace.
ACPI: Add acpi_register_irq() interface.
ACPI: Add acpi_resource_to_address64().
ACPI: Add acpi_walk_resources().
ACPI: Add support for IO port translation attributes in address space descriptors.
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge wailua.hpl.hp.com:/home/helgaas/bk/linux-2.4
into wailua.hpl.hp.com:/home/helgaas/bk/ia64-extras
HP multiport serial: fix build when CONFIG_PCI undefined
(i.e,. for ski simulator).
Correct early_printk declaration.
HP multiport serial card fixes.
Someday HP'll release boxes which can contain more than one
ECI/MP/Diva multiport serial card. This patch, unlike the earlier
one I sent, supports multiple instances of the card.
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
PCI: disable decoding while sizing BARs bugfix (re-enable before return)
i386: Fix enable_acpi_smp_table merge botch.
trivial merge conflict
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
ia64: Update processor type descriptions. CONFIG_ITANIUM is
explicitly the "generic" type.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Hand-merge after upstream took changes.
PCI: fix printk spec for dma_addr_t
Trivial merge fixups.
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Move simeth, simserial, simscsi back to drivers/ for init ordering.
ACPI: (acpi_bus_add) Only check devices for presence, so we don't
mistakenly skip things.
Whitespace fixup in scsi_ioctl (in old toolchain workaround).
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Adopt 2.5 generic xor.h (typo and prefetch fixes).
add ia64 stuff
[PATCH] let binfmt_misc optionally preserve argv[1]
This makes it possible for binfmt_misc to optionally preserve the
contents of argv[1]. This is needed for building accurate simulators
which are invoked via binfmt_misc. I had brought up this patch a while
ago (see URL below) and there was no negative feedback (OK, there was no
feedback at all... ;-).
The patch is trivial and the new behavior is triggered only if the
letter "P" (for "preserve") is appended to the binfmt_misc registration
string, so it shold be completely safe.
http://groups.google.com/groups?q=mosberger+binfmt_misc&hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=200209092241.g89MfPS5001013%40napali.hpl.hp.com&rnum=1
Merge bk://lia64@bkbits.net/linux-ia64-2.4
into build.helgaas:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge fc.hp.com:/home/helgaas/bk/to-marcelo-2.4
into fc.hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Resolve merge conflicts.
agpgart_be.c: Use PCI_AGP_ constants.
Detect HP ZX1 AGP bridge via ACPI instead of the old, unmaintainable
"fake PCI device" scheme.
Factor out collecting status of all AGP devices.
Print AGP version & mode when programming devices.
Fix serverworks_agp_enable() merge botch. (Old code not removed
when pci_find_capability() introduced.)
Factor out updating AGP device command registers.
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Trivial merge fixup.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/linux-2.4
into hp.com:/home/helgaas/bk/ia64-extras
Restore VM_WRITECOMBINED and VM_NONCACHED constants so users will
still compile (the kernel still ignores them, though).
460GX texturing hack.
Remove noncached mapping of O_SYNC files to avoid memory attribute
aliasing issues on IA64.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Remove VM_WRITECOMBINED and VM_NONCACHED support to avoid memory
attribute aliasing issues.
Resolve arg parsing merge conflict.
Resolve trivial merge conflict.
Merge hp.com:/home/helgaas/bk/ia64-extras
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Merge hp.com:/home/helgaas/bk/to-marcelo-2.4
into hp.com:/home/helgaas/bk/linux-ia64-2.4
Correct CPU bitmask truncation to 32-bits.
Fix DRM compile problem.
ia64: Remove McKinley A-step config documentation.
Add generic RAID xor routines with prefetch.
CONFIG_DEVFS_FS required for SGI_SN{1,2}
scsi_dma: Support for 64K pages.
Add QLA2100 4.31.7b driver.
Import QLA1280 3.23 Beta driver.
megaraid: pci mapping fixup.
Disable decoding while sizing BARs, fix printk format.
tulip: Add delay after CSR12 writes.
eepro100: last_rx_time fix.
Disable xconfig.
Compile with debug info.
config documentation updates.
Workaround for old toolchain.
Remove bogus dma64_addr_t usage.
Fix block IO use of dma64_addr_t.
Back out flush_tlb_pgtables change.
Fix prefetch stride.
bootmem changes.
last_time_offset stuff.
Temporarily allow small sigaltstacks for ia64.
ia64 early printk.
Remove "set personality" printk.
Remove obsolete SMP declarations.
Add HP REO ids.
Add hook for architecture-specific mmap_init.
irq stat cleanup
Move irq_desc[] decl to architecture-specific code (replace with
irq_desc() macro).
Increase buffer_head b_size width.
Add "page" to {clear,copy}_user_page() args. (Already in 2.5).
joydev: fix HZ->millisecond transformation (from 2.5 change by vojtech@suse.cz)
Add hook so arch-specific code can determine whether
keyboard controller is present.
VM_WRITECOMBINED and VM_NONCACHED support.
Prevent large lseek returns from being mistaken as errors.
Last bit of VM_DATA_DEFAULT_FLAGS patch (makes rights on a data
page architecture-dependent).
drivers/char/mem.c: handle discontiguous memory when testing for
noncached addresses.
ACPI changes for ia64.
Apply acpi-20020517-2.4.18.diff.
Revert ACPI efi.h change so acpi-20020517-2.4.18.diff applies cleanly.
Revert ACPI comment change so acpi-20020517-2.4.18.diff applies cleanly.
Revert x86-64 ACPI changes so acpi-20020517-2.4.18.diff applies cleanly.
IA64 early printk support (discover UART via HCDP).
ati_pcigart: 64K & 16K page size support.
Intel 460GX GART support. Originally due to Chris Ahna
(christopher.j.ahna@intel.com).
HP ZX1 GART cleanup. Remove cache flush (ZX1 GART is coherent).
DRM 4.0 support for AGP bridges where CPU accesses don't go through
GART aperture.
DRM support for AGP bridges where CPU accesses don't go through GART aperture.
agpgart support for bridges where CPU accesses don't go
through the GART aperture. Originally due to Chris Ahna
(christopher.j.ahna@intel.com).
Fix max AGP memory for machines with discontiguous memory.
Make agp_memory.memory[] (exported from agpgart to DRM) contain physical
addresses, not GATT entries.
DRM assumes agp_memory contains GATT entries, and it converts them to
physical addresses with "paddr = agp_memory.memory[i] & mask". 460GX
requires both a shift and a mask, so exporting plain physical addresses
and a mask of ~0UL allows agpgart to add 460GX support without requiring
DRM interface changes.
ia64: Fix edge-triggered IRQ handling. See Linus's 2.5 cset 1.611 for details.
ia64: Remove McKinley A-step config stuff.
ia64: Discard *.text.exit and *.data.exit sections.
ia64: Remove support for HP prototypes.
ia64: Fix narrow window during which signal could be delivered with only the memory
stack switched over to the alternate signal stack.
ia64: Fix return path of signal delivery for sigaltstack() case.
ia64: Fix perfmon error path leaks.
ia64: Fix perfmon error path missing unlock.
ia64: Fix x86 struct ipc_kludge (reported by R Sreelatha, fix proposed by
Dave Miller).
ia64: Preserve f11-f15 around calls into firmware.
ia64: Print EFI call status in hex, not decimal.
ia64: Rename ia64_alloc_irq to ia64_alloc_vector.
ia64: Move simeth, simserial, simscsi to arch/ia64/hp/sim.
ia64: If more than NR_CPUS found, ignore the extras.
ia64: Reserve syscall numbers 1238-1242 for AIO.
ia64: Fix I/O macros in asm-ia64/io.h. Based on patch by Andreas Schwab.
ia64: ACPI CRS cleanup.
ia64: Remove many warnings.
ia64: Fix iosapic debug code.
ia64: Add missing symbol exports for modules.