Menu
▾
▴
[Linux-mips-commits] CVS: linux/include/asm-mips elf.h,1.2,1.3 hardirq.h,1.3,1.4 ioctls.h,1.1,1.2 pci.h,1.2,1.3 softirq.h,1.1,1.2 system.h,1.2,1.3 termios.h,1.2,1.3
|
From: James S. <jsi...@us...> - 2001-08-22 18:18:18
|
Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv15361/include/asm-mips
Modified Files:
hardirq.h ioctls.h pci.h softirq.h system.h termios.h
Added Files:
elf.h
Log Message:
Synced to Ralph's tree
Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/hardirq.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hardirq.h 2001/08/10 19:54:38 1.3
--- hardirq.h 2001/08/22 18:18:14 1.4
***************
*** 4,9 ****
* for more details.
*
! * Copyright (C) 1997, 1998, 1999, 2000 by Ralf Baechle
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/
#ifndef _ASM_HARDIRQ_H
--- 4,10 ----
* for more details.
*
! * Copyright (C) 1997, 1998, 1999, 2000, 2001 by Ralf Baechle
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ * Copyright (C) 2001 MIPS Technologies, Inc.
*/
#ifndef _ASM_HARDIRQ_H
***************
*** 15,19 ****
#include <linux/spinlock.h>
- /* entry.S is sensitive to the offsets of these fields */
typedef struct {
unsigned int __softirq_pending;
--- 16,19 ----
Index: ioctls.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/ioctls.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ioctls.h 2001/07/24 16:15:25 1.1
--- ioctls.h 2001/08/22 18:18:14 1.2
***************
*** 53,56 ****
--- 53,57 ----
#define FIOASYNC 0x667d
#define FIONBIO 0x667e
+ #define FIOQSIZE 0x667f
#define TIOCGLTC 0x7474 /* get special local chars */
Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pci.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pci.h 2001/07/09 19:28:47 1.2
--- pci.h 2001/08/22 18:18:14 1.3
***************
*** 7,10 ****
--- 7,12 ----
#define _ASM_PCI_H
+ #include <linux/config.h>
+
#ifdef __KERNEL__
***************
*** 13,18 ****
or architectures with incomplete PCI setup by the loader */
! //#define pcibios_assign_all_busses() 0
! #define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x1000
--- 15,23 ----
or architectures with incomplete PCI setup by the loader */
! #ifdef CONFIG_PCI
! extern unsigned int pcibios_assign_all_busses(void);
! #else
! #define pcibios_assign_all_busses() 0
! #endif
#define PCIBIOS_MIN_IO 0x1000
Index: softirq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/softirq.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** softirq.h 2001/08/10 20:06:04 1.1
--- softirq.h 2001/08/22 18:18:14 1.2
***************
*** 1,10 ****
! /* $Id$
! *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
! * Copyright (C) 1997, 1998, 1999, 2000 by Ralf Baechle
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/
#ifndef _ASM_SOFTIRQ_H
--- 1,10 ----
! /*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
! * Copyright (C) 1997, 1998, 1999, 2000, 2001 Ralf Baechle
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ * Copyright (C) 1999, 2001 MIPS Technologies, Inc.
*/
#ifndef _ASM_SOFTIRQ_H
***************
*** 14,27 ****
#include <asm/hardirq.h>
! #define cpu_bh_disable(cpu) do { local_bh_count(cpu)++; barrier(); } while (0)
! #define cpu_bh_enable(cpu) do { barrier(); local_bh_count(cpu)--; } while (0)
#define local_bh_disable() cpu_bh_disable(smp_processor_id())
! #define __local_bh_enable local_bh_enable
! #define local_bh_enable() cpu_bh_enable(smp_processor_id())
#define in_softirq() (local_bh_count(smp_processor_id()) != 0)
! #define __cpu_raise_softirq(cpu,nr) set_bit((nr), &softirq_pending(cpu))
#endif /* _ASM_SOFTIRQ_H */
--- 14,45 ----
#include <asm/hardirq.h>
! extern inline void cpu_bh_disable(int cpu)
! {
! local_bh_count(cpu)++;
! barrier();
! }
!
! extern inline void __cpu_bh_enable(int cpu)
! {
! barrier();
! local_bh_count(cpu)--;
! }
!
#define local_bh_disable() cpu_bh_disable(smp_processor_id())
! #define __local_bh_enable() __cpu_bh_enable(smp_processor_id())
! #define local_bh_enable() \
! do { \
! int cpu; \
! \
! barrier(); \
! cpu = smp_processor_id(); \
! if (!--local_bh_count(cpu) && softirq_pending(cpu)) \
! do_softirq(); \
! } while (0)
#define in_softirq() (local_bh_count(smp_processor_id()) != 0)
! #define __cpu_raise_softirq(cpu, nr) set_bit(nr, &softirq_pending(cpu))
#endif /* _ASM_SOFTIRQ_H */
Index: system.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/system.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** system.h 2001/07/16 18:30:08 1.2
--- system.h 2001/08/22 18:18:14 1.3
***************
*** 256,260 ****
extern void __die_if_kernel(const char *, struct pt_regs *, const char *where,
unsigned long line);
- extern int abs(int);
#define die(msg, regs) \
--- 256,259 ----
Index: termios.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/termios.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** termios.h 2001/08/10 19:24:29 1.2
--- termios.h 2001/08/22 18:18:14 1.3
***************
*** 101,105 ****
#define N_HDLC 13 /* synchronous HDLC */
#define N_SYNC_PPP 14 /* synchronous PPP */
! #define N_HCI 15 /* Bluetooth HCI UART */
#ifdef __KERNEL__
--- 101,105 ----
#define N_HDLC 13 /* synchronous HDLC */
#define N_SYNC_PPP 14 /* synchronous PPP */
! #define N_HCI 15 /* Bluetooth HCI UART */
#ifdef __KERNEL__
|
