2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 44150f2f7bfd..678e5777da81 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -382,7 +382,7 @@ static void rionet_remove(struct rio_dev *rdev)
         struct rionet_peer *peer, *tmp;
 
         free_pages((unsigned long)rionet_active, rdev->net->hport->sys_size ?
-                                        __ilog2(sizeof(void *)) + 4 : 0);
+                                        __fls(sizeof(void *)) + 4 : 0);
         unregister_netdev(ndev);
         free_netdev(ndev);
 
@@ -450,7 +450,7 @@ static int rionet_setup_netdev(struct rio_mport *mport)
         }
 
         rionet_active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
-                        mport->sys_size ? __ilog2(sizeof(void *)) + 4 : 0);
+                        mport->sys_size ? __fls(sizeof(void *)) + 4 : 0);
         if (!rionet_active) {
                 rc = -ENOMEM;
                 goto out;
diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 0d894320e227..4dbe360989be 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -14,6 +14,7 @@
 #include <linux/rio.h>
 #include <linux/rio_drv.h>
 #include <linux/stat.h>
+#include <linux/capability.h>
 
 #include "rio.h"