From owner-svn-src-all@FreeBSD.ORG Tue Jul 10 01:49:50 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D17F3106566B; Tue, 10 Jul 2012 01:49:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BAA268FC18; Tue, 10 Jul 2012 01:49:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6A1noAH052486; Tue, 10 Jul 2012 01:49:50 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6A1no0Q052473; Tue, 10 Jul 2012 01:49:50 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201207100149.q6A1no0Q052473@svn.freebsd.org> From: Warner Losh Date: Tue, 10 Jul 2012 01:49:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238329 - in head/sys/arm: at91 conf econa include mv s3c2xx0 sa11x0 xscale/i80321 xscale/i8134x xscale/ixp425 xscale/pxa X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2012 01:49:51 -0000 Author: imp Date: Tue Jul 10 01:49:50 2012 New Revision: 238329 URL: http://svn.freebsd.org/changeset/base/238329 Log: Remove some unused variables/externs that have been copied too many times... Modified: head/sys/arm/at91/at91_machdep.c head/sys/arm/conf/KB920X head/sys/arm/econa/econa_machdep.c head/sys/arm/include/atomic.h head/sys/arm/mv/mv_machdep.c head/sys/arm/s3c2xx0/s3c24x0_machdep.c head/sys/arm/sa11x0/assabet_machdep.c head/sys/arm/xscale/i80321/ep80219_machdep.c head/sys/arm/xscale/i80321/iq31244_machdep.c head/sys/arm/xscale/i8134x/crb_machdep.c head/sys/arm/xscale/ixp425/avila_machdep.c head/sys/arm/xscale/pxa/pxa_machdep.c Modified: head/sys/arm/at91/at91_machdep.c ============================================================================== --- head/sys/arm/at91/at91_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/at91/at91_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -115,10 +115,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv; Modified: head/sys/arm/conf/KB920X ============================================================================== --- head/sys/arm/conf/KB920X Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/conf/KB920X Tue Jul 10 01:49:50 2012 (r238329) @@ -21,10 +21,16 @@ ident KB920X include "../at91/std.kb920x" +# bring in the sam specific timers and such +#include "../at91/std.at91sam9" +nodevice at91rm9200 +device at91sam9 +device at91sam9x25 # The AT91 platform doesn't use /boot/loader, so we have to statically wire # hints. hints "KB920X.hints" -#makeoptions MODULES_OVERRIDE="" +makeoptions MODULES_OVERRIDE="" +options LINUX_BOOT_ABI makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB @@ -81,7 +87,7 @@ device lxtphy #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device md -device at91_twi # TWI: Two Wire Interface +#device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: device spibus # MMC/SD @@ -137,6 +143,8 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm + +#device cfi options IEEE80211_SUPPORT_MESH options AH_SUPPORT_AR5416 Modified: head/sys/arm/econa/econa_machdep.c ============================================================================== --- head/sys/arm/econa/econa_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/econa/econa_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -103,10 +103,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -114,7 +110,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv; Modified: head/sys/arm/include/atomic.h ============================================================================== --- head/sys/arm/include/atomic.h Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/include/atomic.h Tue Jul 10 01:49:50 2012 (r238329) @@ -347,7 +347,9 @@ atomic_readandclear_32(volatile u_int32_ #define atomic_cmpset_ptr(dst, old, new) \ atomic_cmpset_32((volatile u_int *)(dst), (u_int)(old), (u_int)(new)) #define atomic_cmpset_rel_ptr atomic_cmpset_ptr -#define atomic_cmpset_acq_ptr atomic_cmpset_ptr +#define atomic_cmpset_acq_ptr(dst, old, new) \ + atomic_cmpset_ptr((volatile uint32_t *)(dst), (volatile uint32_t)(old), \ + (volatile uint32_t)(new)) #define atomic_store_ptr atomic_store_32 #define atomic_store_rel_ptr atomic_store_ptr Modified: head/sys/arm/mv/mv_machdep.c ============================================================================== --- head/sys/arm/mv/mv_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/mv/mv_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -115,16 +115,11 @@ extern unsigned char _edata[]; extern unsigned char __bss_start[]; extern unsigned char _end[]; -#ifdef DDB -extern vm_offset_t ksym_start, ksym_end; -#endif - extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; extern vm_offset_t pmap_bootstrap_lastaddr; -extern int *end; struct pv_addr kernel_pt_table[KERNEL_PT_MAX]; struct pcpu __pcpu; @@ -134,7 +129,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; vm_offset_t pmap_bootstrap_lastaddr; const struct pmap_devmap *pmap_devmap_bootstrap_table; Modified: head/sys/arm/s3c2xx0/s3c24x0_machdep.c ============================================================================== --- head/sys/arm/s3c2xx0/s3c24x0_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/s3c2xx0/s3c24x0_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -118,10 +118,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -129,7 +125,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv; @@ -203,10 +198,6 @@ static const struct pmap_devmap s3c24x0_ #define ioreg_read32(a) (*(volatile uint32_t *)(a)) #define ioreg_write32(a,v) (*(volatile uint32_t *)(a)=(v)) -#ifdef DDB -extern vm_offset_t ksym_start, ksym_end; -#endif - struct arm32_dma_range s3c24x0_range = { .dr_sysbase = 0, .dr_busbase = 0, Modified: head/sys/arm/sa11x0/assabet_machdep.c ============================================================================== --- head/sys/arm/sa11x0/assabet_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/sa11x0/assabet_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -119,14 +119,10 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - extern vm_offset_t sa1110_uart_vaddr; extern vm_offset_t sa1_cache_clean_addr; -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -140,7 +136,6 @@ vm_paddr_t dump_avail[4]; vm_paddr_t physical_start; vm_paddr_t physical_end; vm_paddr_t physical_freestart; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr irqstack; Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c ============================================================================== --- head/sys/arm/xscale/i80321/ep80219_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/xscale/i80321/ep80219_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -115,10 +115,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv; Modified: head/sys/arm/xscale/i80321/iq31244_machdep.c ============================================================================== --- head/sys/arm/xscale/i80321/iq31244_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/xscale/i80321/iq31244_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -115,10 +115,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv; Modified: head/sys/arm/xscale/i8134x/crb_machdep.c ============================================================================== --- head/sys/arm/xscale/i8134x/crb_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/xscale/i8134x/crb_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -117,7 +117,6 @@ extern u_int prefetch_abort_handler_addr extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern int *end; struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -126,7 +125,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv; Modified: head/sys/arm/xscale/ixp425/avila_machdep.c ============================================================================== --- head/sys/arm/xscale/ixp425/avila_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/xscale/ixp425/avila_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -119,10 +119,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -130,7 +126,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv; Modified: head/sys/arm/xscale/pxa/pxa_machdep.c ============================================================================== --- head/sys/arm/xscale/pxa/pxa_machdep.c Tue Jul 10 01:47:11 2012 (r238328) +++ head/sys/arm/xscale/pxa/pxa_machdep.c Tue Jul 10 01:49:50 2012 (r238329) @@ -115,10 +115,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern void *_end; - -extern int *end; - struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; @@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu; vm_paddr_t phys_avail[PXA2X0_SDRAM_BANKS * 2 + 4]; vm_paddr_t dump_avail[PXA2X0_SDRAM_BANKS * 2 + 4]; -vm_offset_t physical_pages; struct pv_addr systempage; struct pv_addr msgbufpv;