Thread: [Linux-mips-commits] CVS: linux/include/asm-mips64 elf.h,1.1.1.1,1.2 hardirq.h,1.1,1.2 ide.h,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv15361/include/asm-mips64

Modified Files:
	elf.h hardirq.h ide.h pci.h socket.h softirq.h termios.h 
Log Message:
Synced to Ralph's tree

Index: elf.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/elf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** elf.h	2001/06/22 02:29:33	1.1.1.1
--- elf.h	2001/08/22 18:18:14	1.2
***************
*** 94,98 ****

  #ifndef ELF_ET_DYN_BASE
! #define ELF_ET_DYN_BASE         (2 * TASK_SIZE / 3)
  #endif

--- 94,98 ----

  #ifndef ELF_ET_DYN_BASE
! #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif

Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/hardirq.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hardirq.h	2001/08/10 19:55:51	1.1
--- hardirq.h	2001/08/22 18:18:14	1.2
***************
*** 4,9 ****
   * for more details.
   *
!  * Copyright (C) 1997 - 2000 by Ralf Baechle
   * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
   */
  #ifndef _ASM_HARDIRQ_H
--- 4,10 ----
   * for more details.
   *
!  * Copyright (C) 1997 - 2000, 2001 by Ralf Baechle
   * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+  * Copyright (C) 2001 MIPS Technologies, Inc.
   */
  #ifndef _ASM_HARDIRQ_H
***************
*** 14,18 ****
  #include <linux/irq.h>

- /* entry.S is sensitive to the offsets of these fields */
  typedef struct {
  	unsigned int __softirq_pending;
--- 15,18 ----

Index: ide.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/ide.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ide.h	2001/08/20 17:29:56	1.2
--- ide.h	2001/08/22 18:18:14	1.3
***************
*** 9,12 ****
--- 9,16 ----
   */

+ /*
+  *  This file contains the MIPS architecture specific IDE code.
+  */
+ 
  #ifndef __ASM_IDE_H
  #define __ASM_IDE_H

Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pci.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pci.h	2001/06/22 02:29:33	1.1.1.1
--- pci.h	2001/08/22 18:18:14	1.2
***************
*** 7,10 ****
--- 7,12 ----
  #define _ASM_PCI_H

+ #include <linux/config.h>
+ 
  #ifdef __KERNEL__

***************
*** 13,17 ****
--- 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: socket.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/socket.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** socket.h	2001/08/10 19:28:11	1.4
--- socket.h	2001/08/22 18:18:14	1.5
***************
*** 4,9 ****
   * for more details.
   *
!  * Copyright (C) 1997, 1999, 2000 Ralf Baechle
!  * Copyright (C) 2000 Silicon Graphics, Inc.
   */
  #ifndef _ASM_SOCKET_H
--- 4,9 ----
   * for more details.
   *
!  * Copyright (C) 1997, 1999, 2000, 2001 Ralf Baechle
!  * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
   */
  #ifndef _ASM_SOCKET_H
***************
*** 42,46 ****
  #define SO_SNDTIMEO	0x1005	/* send timeout */
  #define SO_RCVTIMEO 	0x1006	/* receive timeout */
! #define SO_ACCEPTCONN	0x1007

  /* linux-specific, might as well be the same as on i386 */
--- 42,46 ----
  #define SO_SNDTIMEO	0x1005	/* send timeout */
  #define SO_RCVTIMEO 	0x1006	/* receive timeout */
! #define SO_ACCEPTCONN	0x1009

  /* linux-specific, might as well be the same as on i386 */

Index: softirq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/softirq.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** softirq.h	2001/08/10 20:07:27	1.1
--- softirq.h	2001/08/22 18:18:14	1.2
***************
*** 4,9 ****
   * for more details.
   *
!  * Copyright (C) 1997, 1998, 1999, 2000 by Ralf Baechle
   * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
   */
  #ifndef _ASM_SOFTIRQ_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_SOFTIRQ_H
***************
*** 13,26 ****
  #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,57 ----
  #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)

! extern inline void __cpu_raise_softirq(int cpu, int nr)
! {
! 	unsigned int *m = (unsigned int *) &softirq_pending(cpu);
! 	unsigned int temp;
! 
! 	__asm__ __volatile__(
! 		"1:\tll\t%0, %1\t\t\t# __cpu_raise_softirq\n\t"
! 		"or\t%0, %2\n\t"
! 		"sc\t%0, %1\n\t"
! 		"beqz\t%0, 1b"
! 		: "=&r" (temp), "=m" (*m)
! 		: "ir" (1UL << nr), "m" (*m)
! 		: "memory");
! }

  #endif /* _ASM_SOFTIRQ_H */

Index: termios.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/termios.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** termios.h	2001/08/10 19:28:58	1.2
--- termios.h	2001/08/22 18:18:14	1.3
***************
*** 1,9 ****
! /* $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) 1995, 1996 by Ralf Baechle
   */
  #ifndef _ASM_TERMIOS_H
--- 1,9 ----
! /*
   * 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) 1995, 1996, 2000, 2001 by Ralf Baechle
!  * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
   */
  #ifndef _ASM_TERMIOS_H
***************
*** 102,106 ****
  #define N_HDLC		13	/* synchronous HDLC */
  #define N_SYNC_PPP	14	/* synchronous PPP */
! #define N_HCI		15  /* Bluetooth HCI UART */

  #ifdef __KERNEL__
--- 102,106 ----
  #define N_HDLC		13	/* synchronous HDLC */
  #define N_SYNC_PPP	14	/* synchronous PPP */
! #define N_HCI		15	/* Bluetooth HCI UART */

  #ifdef __KERNEL__

Thread: [Linux-mips-commits] CVS: linux/include/asm-mips64 elf.h,1.1.1.1,1.2 hardirq.h,1.1,1.2 ide.h,1.2,1.3

linux-mips-commits