Commit 2b12a4c5 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Move include/asm-ia64 to arch/ia64/include/asm
parents 4744b434 7f30491c
/* /*
* asm-ia64/acpi.h
*
* Copyright (C) 1999 VA Linux Systems * Copyright (C) 1999 VA Linux Systems
* Copyright (C) 1999 Walt Drummond <drummond@valinux.com> * Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
* Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com> * Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>
......
/* /*
* include/asm-ia64/cputime.h: * Definitions for measuring cputime on ia64 machines.
* Definitions for measuring cputime on ia64 machines.
* *
* Based on <asm-powerpc/cputime.h>. * Based on <asm-powerpc/cputime.h>.
* *
......
#ifndef _IA64_KDEBUG_H #ifndef _IA64_KDEBUG_H
#define _IA64_KDEBUG_H 1 #define _IA64_KDEBUG_H 1
/* /*
* include/asm-ia64/kdebug.h
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define _ASM_KPROBES_H #define _ASM_KPROBES_H
/* /*
* Kernel Probes (KProbes) * Kernel Probes (KProbes)
* include/asm-ia64/kprobes.h
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __ASM_IA64_KVM_H #define __ASM_IA64_KVM_H
/* /*
* asm-ia64/kvm.h: kvm structure definitions for ia64 * kvm structure definitions for ia64
* *
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com> * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
* *
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#define __IA64_KVM_PARA_H #define __IA64_KVM_PARA_H
/* /*
* asm-ia64/kvm_para.h
*
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com> * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
......
...@@ -290,7 +290,7 @@ extern void machvec_init (const char *name); ...@@ -290,7 +290,7 @@ extern void machvec_init (const char *name);
extern void machvec_init_from_cmdline(const char *cmdline); extern void machvec_init_from_cmdline(const char *cmdline);
# else # else
# error Unknown configuration. Update asm-ia64/machvec.h. # error Unknown configuration. Update arch/ia64/include/asm/machvec.h.
# endif /* CONFIG_IA64_GENERIC */ # endif /* CONFIG_IA64_GENERIC */
/* /*
......
/****************************************************************************** /******************************************************************************
* include/asm-ia64/native/inst.h * arch/ia64/include/asm/native/inst.h
* *
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
......
/****************************************************************************** /******************************************************************************
* include/asm-ia64/native/irq.h * arch/ia64/include/asm/native/irq.h
* *
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* moved from linux/include/asm-ia64/irq.h.
*/ */
#ifndef _ASM_IA64_NATIVE_IRQ_H #ifndef _ASM_IA64_NATIVE_IRQ_H
......
/****************************************************************************** /******************************************************************************
* include/asm-ia64/paravirt.h
*
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
* *
......
/****************************************************************************** /******************************************************************************
* include/asm-ia64/paravirt_privops.h
*
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
* *
......
/* /*
* asm-ia64/rwsem.h: R/W semaphores for ia64 * R/W semaphores for ia64
* *
* Copyright (C) 2003 Ken Chen <kenneth.w.chen@intel.com> * Copyright (C) 2003 Ken Chen <kenneth.w.chen@intel.com>
* Copyright (C) 2003 Asit Mallick <asit.k.mallick@intel.com> * Copyright (C) 2003 Asit Mallick <asit.k.mallick@intel.com>
......
/* /*
* include/asm-ia64/serial.h
*
* Derived from the i386 version. * Derived from the i386 version.
*/ */
......
...@@ -1094,7 +1094,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift, ...@@ -1094,7 +1094,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift,
/* /*
* This is the access point to the Altix PROM hardware performance * This is the access point to the Altix PROM hardware performance
* and status monitoring interface. For info on using this, see * and status monitoring interface. For info on using this, see
* include/asm-ia64/sn/sn2/sn_hwperf.h * arch/ia64/include/asm/sn/sn2/sn_hwperf.h
*/ */
static inline int static inline int
ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2, ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2,
......
/* /*
* linux/include/asm-ia64/topology.h
*
* Copyright (C) 2002, Erich Focht, NEC * Copyright (C) 2002, Erich Focht, NEC
* *
* All rights reserved. * All rights reserved.
......
/* /*
* include/asm-ia64/xor.h
*
* Optimized RAID-5 checksumming functions for IA-64. * Optimized RAID-5 checksumming functions for IA-64.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#include <linux/pid.h> #include <linux/pid.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <linux/kbuild.h> #include <linux/kbuild.h>
#include <asm-ia64/processor.h> #include <asm/processor.h>
#include <asm-ia64/ptrace.h> #include <asm/ptrace.h>
#include <asm-ia64/siginfo.h> #include <asm/siginfo.h>
#include <asm-ia64/sigcontext.h> #include <asm/sigcontext.h>
#include <asm-ia64/mca.h> #include <asm/mca.h>
#include "../kernel/sigframe.h" #include "../kernel/sigframe.h"
#include "../kernel/fsyscall_gtod_data.h" #include "../kernel/fsyscall_gtod_data.h"
......
...@@ -1123,7 +1123,7 @@ SET_REG(b5); ...@@ -1123,7 +1123,7 @@ SET_REG(b5);
* p15 - used to track flag status. * p15 - used to track flag status.
* *
* If you patch this code to use more registers, do not forget to update * If you patch this code to use more registers, do not forget to update
* the clobber lists for spin_lock() in include/asm-ia64/spinlock.h. * the clobber lists for spin_lock() in arch/ia64/include/asm/spinlock.h.
*/ */
#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3) #if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
* systems, we use one-to-one mapping between IA-64 vector and IRQ. A * systems, we use one-to-one mapping between IA-64 vector and IRQ. A
* platform can implement platform_irq_to_vector(irq) and * platform can implement platform_irq_to_vector(irq) and
* platform_local_vector_to_irq(vector) APIs to differentiate the mapping. * platform_local_vector_to_irq(vector) APIs to differentiate the mapping.
* Please see also include/asm-ia64/hw_irq.h for those APIs. * Please see also arch/ia64/include/asm/hw_irq.h for those APIs.
* *
* To sum up, there are three levels of mappings involved: * To sum up, there are three levels of mappings involved:
* *
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
* to the correct location. * to the correct location.
*/ */
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm-ia64/break.h> #include <asm/break.h>
/* /*
* void jprobe_break(void) * void jprobe_break(void)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/kbuild.h> #include <linux/kbuild.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <asm-ia64/native/irq.h> #include <asm/native/irq.h>
void foo(void) void foo(void)
{ {
......
...@@ -314,7 +314,7 @@ static inline void __init setup_crashkernel(unsigned long total, int *n) ...@@ -314,7 +314,7 @@ static inline void __init setup_crashkernel(unsigned long total, int *n)
* *
* Setup the reserved memory areas set aside for the boot parameters, * Setup the reserved memory areas set aside for the boot parameters,
* initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined, * initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined,
* see include/asm-ia64/meminit.h if you need to define more. * see arch/ia64/include/asm/meminit.h if you need to define more.
*/ */
void __init void __init
reserve_memory (void) reserve_memory (void)
......
...@@ -63,7 +63,7 @@ EXPORT_SYMBOL(sn_io_addr); ...@@ -63,7 +63,7 @@ EXPORT_SYMBOL(sn_io_addr);
/** /**
* __sn_mmiowb - I/O space memory barrier * __sn_mmiowb - I/O space memory barrier
* *
* See include/asm-ia64/io.h and Documentation/DocBook/deviceiobook.tmpl * See arch/ia64/include/asm/io.h and Documentation/DocBook/deviceiobook.tmpl
* for details. * for details.
* *
* On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear. * On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment