From 1836aefc28674a3f5a361ebd2fb97dbdd35149df Mon Sep 17 00:00:00 2001
From: Matt Benjamin <matt@linuxbox.com>
Date: Mon, 12 Jan 2009 14:33:37 +0000
Subject: [PATCH] STABLE14-freebsd-cleanup-20090112

LICENSE IPL10
FIXES 124107

minor freebsd cleanup


(cherry picked from commit ba9556ff2bbf854bb5c05074032b94973bf339ec)
---
 src/afs/FBSD/osi_vnodeops.c      | 3 +--
 src/libafs/MakefileProto.FBSD.in | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 966fb6f4f..cf65d5006 100644
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -1044,8 +1044,7 @@ afs_vop_ioctl(ap)
     if (((ap->a_command >> 8) & 0xff) == 'V') {
 	/* This is a VICEIOCTL call */
 	AFS_GLOCK();
-	error = HandleIoctl(tvc, NULL /*Not used */ ,
-			    ap->a_command, ap->a_data);
+	error = HandleIoctl(tvc, ap->a_command, ap->a_data);
 	AFS_GUNLOCK();
 	return (error);
     } else {
diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index 18e68904d..f0eaf1e17 100644
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -29,6 +29,10 @@ AFS_OS_NONFSOBJS = \
 # System specific build commands and flags
 KSRC = @BSD_KERNEL_PATH@
 KBLD = @BSD_KERNEL_BUILD@
+<amd64_fbsd_70 amd64_fbsd_71 amd64_fbsd_80>
+KOPTS = -fPIC
+<all>
+
 KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
 	    -elf \
 <i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
@@ -41,10 +45,6 @@ KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
 	-I${KBLD} -include opt_global.h -fno-strict-aliasing
 <all>
 
-<amd64_fbsd_70 amd64_fbsd_71 amd64_fbsd_80>
-KOPTS=-fPIC
-<all>
-
 DBUG = -O2
 #DBUG = -O -g
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
-- 
2.39.5