 @@ -1,14 +1,14 @@
-/* $NetBSD: kern.ldscript,v 1.5.78.1 2010/12/22 06:13:36 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.5.78.2 2011/12/03 01:44:04 matt Exp $ */
 /*  ldscript for NetBSD/mips kernels and LKMs */
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SEARCH_DIR(/lib);
 /* Do we need any of these?
    __DYNAMIC = 0;    */
 _DYNAMIC_LINK = 0;
 SECTIONS
+{
   /*  Read-only sections, merged into text segment.  Assumes the
       kernel Makefile sets the start address via -Ttext.  */
   .text      :
 @@ -20,26 +20,31 @@ SECTIONS
     __stub_end = . ;
     *(.gnu.warning)
   } =0
   _etext = .;
   PROVIDE (etext = .);
   .rodata    : { *(.rodata) *(.rodata.*) }
   .reginfo : { *(.reginfo) }
 /*  . = . + 0x1000; */
   .data    :
+  {
     _fdata = . ;
     *(.data)
     CONSTRUCTORS
    . = ALIGN(32);       /* COHERENCY_UNIT */
    *(.data.cacheline_aligned)
    . = ALIGN(32);       /* COHERENCY_UNIT */
    *(.data.read_mostly)
    . = ALIGN(32);       /* COHERENCY_UNIT */
+  }
   _gp = ALIGN(16) + 0x7ff0;
   .lit8 : { *(.lit8) }
   .lit4 : { *(.lit4) }
   .sdata     : { *(.sdata) }
   _edata  =  .;
   PROVIDE (edata = .);
   __bss_start = .;
   _fbss = .;
   .sbss      : { *(.sbss) *(.scommon) }
   .bss       :
+  {
    *(.bss)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mips_param.h,v 1.23.78.7 2011/12/02 00:01:37 matt Exp $	*/
+/*	$NetBSD: mips_param.h,v 1.23.78.8 2011/12/03 01:44:04 matt Exp $	*/
 #ifdef _KERNEL
 #include <machine/cpu.h>
 #endif
 /*
  * No reason this can't be common
  */
 #if defined(__MIPSEB__)
 # if defined(__mips_n32) || defined(__mips_n64)
 #  define	_MACHINE_ARCH	mips64eb
 #  define	MACHINE_ARCH	"mips64eb"
 #  define	_MACHINE32_ARCH	mipseb
 @@ -44,26 +44,30 @@
 #define	USPACE		(UPAGES*NBPG)	/* size of u-area in bytes */
 #elif defined(ENABLE_MIPS_4KB_PAGE) || 1
 #define	UPAGES		2		/* pages of u-area */
 #define	USPACE		(UPAGES*NBPG)	/* size of u-area in bytes */
 #define	USPACE_ALIGN	USPACE		/* make sure it starts on a even VA */
 #else
 #error ENABLE_MIPS_xKB_PAGE not defined
 #endif
 #ifndef MSGBUFSIZE
 #define MSGBUFSIZE	NBPG		/* default message buffer size */
 #endif
 #ifndef COHERENCY_UNIT
 #define COHERENCY_UNIT	32	/* MIPS cachelines are usually 32 bytes */
 #endif
 /*
  * Round p (pointer or byte index) up to a correctly-aligned value for all
  * data types (int, long, ...).   The result is u_int and must be cast to
  * any desired pointer type.
+ *
  * ALIGNED_POINTER is a boolean macro that checks whether an address
  * is valid to fetch data elements of type t from on this architecture.
  * This does not reflect the optimal alignment, just the possibility
  * (within reasonable limits).
+ *
  */
 #define	ALIGNBYTES	7
 #define	ALIGN(p)	(((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gre.h,v 1.39 2008/09/08 23:36:55 gmcgarry Exp $ */
+/*	$NetBSD: if_gre.h,v 1.39.12.1 2011/12/03 01:44:03 matt Exp $ */
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Heiko W.Rupp <hwr@pilhuhn.de>
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David Young <dyoung@NetBSD.org>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -53,32 +53,32 @@ struct gre_soparm {
 	int		sp_type;	/* encapsulating socket type */
 	int		sp_proto;	/* encapsulating protocol */
 	bool		sp_bysock;	/* encapsulation configured by passing
 					 * socket, not by SIOCSLIFPHYADDR
 					 */
 };
 enum gre_state {
 	  GRE_S_IDLE = 0
 	, GRE_S_IOCTL
 	, GRE_S_DIE
 };
-#define	__cacheline_aligned	__aligned(CACHE_LINE_SIZE)
+#define	__xcacheline_aligned	__aligned(CACHE_LINE_SIZE)
 struct gre_bufq {
 	volatile int	bq_prodidx;
 	volatile int	bq_considx;
-	size_t		bq_len __cacheline_aligned;
+	size_t		bq_len __xcacheline_aligned;
 	size_t		bq_lenmask;
 	volatile int	bq_drops;
 	struct mbuf	**bq_buf;
 };
 MALLOC_DECLARE(M_GRE_BUFQ);
 enum gre_msg {
 	  GRE_M_NONE = 0
 	, GRE_M_SETFP
 	, GRE_M_DELFP
 	, GRE_M_STOP
 	, GRE_M_OK

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cdefs_elf.h,v 1.30 2008/07/21 15:22:19 lukem Exp $	*/
+/*	$NetBSD: cdefs_elf.h,v 1.30.12.1 2011/12/03 01:44:04 matt Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -146,14 +146,52 @@
 #define	__link_set_add_data2(set, sym, n)   __link_set_make_entry2(set, sym, n)
 #define	__link_set_add_bss2(set, sym, n)    __link_set_make_entry2(set, sym, n)
 #define	__link_set_decl(set, ptype)					\
 	extern ptype * const __start_link_set_##set[];			\
 	extern ptype * const __stop_link_set_##set[]			\
 #define	__link_set_start(set)	(__start_link_set_##set)
 #define	__link_set_end(set)	(__stop_link_set_##set)
 #define	__link_set_count(set)						\
 	(__link_set_end(set) - __link_set_start(set))
 #ifdef _KERNEL
 /*
  * On multiprocessor systems we can gain an improvement in performance
  * by being mindful of which cachelines data is placed in.
+ *
  * __read_mostly:
+ *
  *	It makes sense to ensure that rarely modified data is not
  *	placed in the same cacheline as frequently modified data.
  *	To mitigate the phenomenon known as "false-sharing" we
  *	can annotate rarely modified variables with __read_mostly.
  *	All such variables are placed into the .data.read_mostly
  *	section in the kernel ELF.
+ *
  *	Prime candidates for __read_mostly annotation are variables
  *	which are hardly ever modified and which are used in code
  *	hot-paths, e.g. pmap_initialized.
+ *
  * __cacheline_aligned:
+ *
  *	Some data structures (mainly locks) benefit from being aligned
  *	on a cacheline boundary, and having a cacheline to themselves.
  *	This way, the modification of other data items cannot adversely
  *	affect the lock and vice versa.
+ *
  *	Any variables annotated with __cacheline_aligned will be
  *	placed into the .data.cacheline_aligned ELF section.
  */
 #define	__read_mostly						\
     __attribute__((__section__(".data.read_mostly")))
 #define	__cacheline_aligned					\
     __attribute__((__aligned__(COHERENCY_UNIT),			\
 		 __section__(".data.cacheline_aligned")))
 #endif /* _KERNEL */
 #endif /* !_SYS_CDEFS_ELF_H_ */