ppc64: add some bluetooth ioctls and clean up some warnings

diff --git a/arch/ppc64/kernel/ioctl32.c b/arch/ppc64/kernel/ioctl32.c
index f9a58cce8b8741c36b4db489de0ce12d18be4ce1..7e0f5aa3f670c509188fa6c69979a399f30921db 100644 (file)
--- a/arch/ppc64/kernel/ioctl32.c
+++ b/arch/ppc64/kernel/ioctl32.c
@@ -99,6 +99,7 @@
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci.h>
+#include <net/bluetooth/rfcomm.h>
 
 #include <linux/usb.h>
 #include <linux/usbdevice_fs.h>
@@ -3633,6 +3634,15 @@ static int do_blkgetsize64(unsigned int fd, unsigned int cmd,
        return sys_ioctl(fd, BLKGETSIZE64, arg);
 }
 
+/* Bluetooth ioctls */
+#define HCIUARTSETPROTO        _IOW('U', 200, int)
+#define HCIUARTGETPROTO        _IOR('U', 201, int)
+
+#define BNEPCONNADD     _IOW('B', 200, int)
+#define BNEPCONNDEL     _IOW('B', 201, int)
+#define BNEPGETCONNLIST        _IOR('B', 210, int)
+#define BNEPGETCONNINFO        _IOR('B', 211, int)
+
 struct ioctl_trans {
        unsigned long cmd;
        unsigned long handler;
@@ -4241,6 +4251,17 @@ COMPATIBLE_IOCTL(HCISETLINKMODE),
 COMPATIBLE_IOCTL(HCISETACLMTU),
 COMPATIBLE_IOCTL(HCISETSCOMTU),
 COMPATIBLE_IOCTL(HCIINQUIRY),
+COMPATIBLE_IOCTL(HCIUARTSETPROTO),
+COMPATIBLE_IOCTL(HCIUARTGETPROTO),
+COMPATIBLE_IOCTL(RFCOMMCREATEDEV),
+COMPATIBLE_IOCTL(RFCOMMRELEASEDEV),
+COMPATIBLE_IOCTL(RFCOMMGETDEVLIST),
+COMPATIBLE_IOCTL(RFCOMMGETDEVINFO),
+COMPATIBLE_IOCTL(RFCOMMSTEALDLC),
+COMPATIBLE_IOCTL(BNEPCONNADD),
+COMPATIBLE_IOCTL(BNEPCONNDEL),
+COMPATIBLE_IOCTL(BNEPGETCONNLIST),
+COMPATIBLE_IOCTL(BNEPGETCONNINFO),
 COMPATIBLE_IOCTL(PCIIOC_CONTROLLER),
 COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO),
 COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_MEM),

diff --git a/arch/ppc64/kernel/syscalls.c b/arch/ppc64/kernel/syscalls.c
index 9337deeb6a1763281dd5732d2f31a5bfec704bb4..bacd6f6c1e19b63ff790efe364144add62b47ee6 100644 (file)
--- a/arch/ppc64/kernel/syscalls.c
+++ b/arch/ppc64/kernel/syscalls.c
@@ -44,7 +44,6 @@
 #include <asm/time.h>
 
 extern unsigned long wall_jiffies;
-#define USEC_PER_SEC (1000000)
 
 void
 check_bugs(void)

diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index 23d0a9202710068cb5ff91358aa9b6a74c270c23..f534ae598edd7b2c32f706446530fdbdec16b86e 100644 (file)
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -77,7 +77,6 @@ static unsigned long first_settimeofday = 1;
 #endif
 
 #define XSEC_PER_SEC (1024*1024)
-#define USEC_PER_SEC (1000000)
 
 unsigned long tb_ticks_per_jiffy;
 unsigned long tb_ticks_per_usec;

diff --git a/arch/ppc64/oprofile/timer_int.c b/arch/ppc64/oprofile/timer_int.c
index 8e6253e9c8d4cb5de433e963fd0b24e60c8d68cf..833b685d45764aacfeeaeb16ff261925eee2b9cb 100644 (file)
--- a/arch/ppc64/oprofile/timer_int.c
+++ b/arch/ppc64/oprofile/timer_int.c
@@ -13,6 +13,7 @@
 #include <linux/smp.h>
 #include <linux/irq.h>
 #include <linux/oprofile.h>
+#include <linux/profile.h>
 #include <asm/ptrace.h>
  
 static int timer_notify(struct notifier_block * self, unsigned long val, void * data)