From e961a680eb6ab6ce34807d389932904255c30c9b Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 20 Mar 2010 11:08:54 +0100 Subject: [PATCH] Put 4 more kernel files under -Werror (fix x86_64 warnings). --- sys/conf/files | 8 ++++---- sys/dev/disk/amd/amd.c | 4 ++-- sys/dev/disk/buslogic/bt.c | 2 +- sys/dev/raid/asr/asr.c | 2 +- sys/dev/raid/dpt/dpt_scsi.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 7502c5fde4..778e96ec50 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -138,7 +138,7 @@ dev/netif/an/if_an_pci.c optional an pci dev/netif/an/if_an_pccard.c optional an pccard dev/netif/ar/if_ar.c optional ar dev/netif/ar/if_ar_pci.c optional ar pci -dev/raid/asr/asr.c optional nowerror asr pci +dev/raid/asr/asr.c optional asr pci dev/disk/ata/ata-all.c optional ata dev/disk/ata/ata-isa.c optional ata isa dev/disk/ata/ata-card.c optional ata pccard @@ -292,7 +292,7 @@ dev/netif/ale/if_ale.c optional ale dev/netif/bce/if_bce.c optional bce dev/netif/bfe/if_bfe.c optional bfe dev/netif/bge/if_bge.c optional bge -dev/disk/buslogic/bt.c optional nowerror bt +dev/disk/buslogic/bt.c optional bt dev/disk/buslogic/bt_isa.c optional bt isa dev/disk/buslogic/bt_eisa.c optional bt eisa dev/disk/buslogic/bt_pci.c optional bt pci @@ -305,7 +305,7 @@ dev/misc/dcons/dcons.c optional dcons dev/misc/dcons/dcons_crom.c optional dcons_crom dev/misc/dcons/dcons_os.c optional dcons #dev/raid/dpt/dpt_control.c optional dpt -dev/raid/dpt/dpt_scsi.c optional nowerror dpt +dev/raid/dpt/dpt_scsi.c optional dpt dev/raid/dpt/dpt_eisa.c optional dpt eisa dev/raid/dpt/dpt_pci.c optional dpt pci dev/netif/ed/if_ed.c optional nowerror ed @@ -1310,7 +1310,7 @@ dev/agp/agp_x86_64.c optional agp dev/agp/agp_i810.c optional agp dev/agp/agp_ati.c optional agp dev/agp/agp_if.m optional agp -dev/disk/amd/amd.c optional nowerror amd +dev/disk/amd/amd.c optional amd dev/video/bktr/bktr_audio.c optional bktr pci dev/video/bktr/bktr_card.c optional bktr pci dev/video/bktr/bktr_core.c optional bktr pci diff --git a/sys/dev/disk/amd/amd.c b/sys/dev/disk/amd/amd.c index 63317d5327..72e63615a4 100644 --- a/sys/dev/disk/amd/amd.c +++ b/sys/dev/disk/amd/amd.c @@ -713,7 +713,7 @@ amd_poll(struct cam_sim * psim) static u_int8_t * phystovirt(struct amd_srb * pSRB, u_int32_t xferCnt) { - int dataPtr; + intptr_t dataPtr; struct ccb_scsiio *pcsio; u_int8_t i; struct amd_sg * pseg; @@ -721,7 +721,7 @@ phystovirt(struct amd_srb * pSRB, u_int32_t xferCnt) dataPtr = 0; pcsio = &pSRB->pccb->csio; - dataPtr = (int) pcsio->data_ptr; + dataPtr = (intptr_t) pcsio->data_ptr; pseg = pSRB->SGsegment; for (i = 0; i < pSRB->SGIndex; i++) { dataPtr += (int) pseg->SGXLen; diff --git a/sys/dev/disk/buslogic/bt.c b/sys/dev/disk/buslogic/bt.c index abb91deaf2..b016eb70f6 100644 --- a/sys/dev/disk/buslogic/bt.c +++ b/sys/dev/disk/buslogic/bt.c @@ -108,7 +108,7 @@ static __inline struct bt_ccb * btccbptov(struct bt_softc *bt, u_int32_t ccb_addr) { return (bt->bt_ccb_array + - ((struct bt_ccb*)ccb_addr-(struct bt_ccb*)bt->bt_ccb_physbase)); + ((struct bt_ccb*)(uintptr_t)ccb_addr-(struct bt_ccb*)(uintptr_t)bt->bt_ccb_physbase)); } static __inline u_int32_t diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c index b45de94a03..139dd1a9dc 100644 --- a/sys/dev/raid/asr/asr.c +++ b/sys/dev/raid/asr/asr.c @@ -3755,7 +3755,7 @@ asr_ioctl(struct dev_ioctl_args *ap) sysInfo_S Info; char * cp; /* Kernel Specific ptok `hack' */ -# define ptok(a) ((char *)(a) + KERNBASE) +# define ptok(a) ((char *)(uintptr_t)(a) + KERNBASE) bzero (&Info, sizeof(Info)); diff --git a/sys/dev/raid/dpt/dpt_scsi.c b/sys/dev/raid/dpt/dpt_scsi.c index 2436c8fa63..faf1245cf6 100644 --- a/sys/dev/raid/dpt/dpt_scsi.c +++ b/sys/dev/raid/dpt/dpt_scsi.c @@ -111,7 +111,7 @@ static __inline int dpt_wait(dpt_softc_t *dpt, u_int bits, static __inline struct dpt_ccb* dptgetccb(struct dpt_softc *dpt); static __inline void dptfreeccb(struct dpt_softc *dpt, struct dpt_ccb *dccb); -static __inline u_int32_t dptccbvtop(struct dpt_softc *dpt, +static __inline bus_addr_t dptccbvtop(struct dpt_softc *dpt, struct dpt_ccb *dccb); static __inline int dpt_send_immediate(dpt_softc_t *dpt, @@ -255,7 +255,7 @@ dptfreeccb(struct dpt_softc *dpt, struct dpt_ccb *dccb) crit_exit(); } -static __inline u_int32_t +static __inline bus_addr_t dptccbvtop(struct dpt_softc *dpt, struct dpt_ccb *dccb) { return (dpt->dpt_ccb_busbase @@ -263,7 +263,7 @@ dptccbvtop(struct dpt_softc *dpt, struct dpt_ccb *dccb) } static __inline struct dpt_ccb * -dptccbptov(struct dpt_softc *dpt, u_int32_t busaddr) +dptccbptov(struct dpt_softc *dpt, bus_addr_t busaddr) { return (dpt->dpt_dccbs + ((struct dpt_ccb *)busaddr -- 2.41.0