diff -Naur kernel.21.3.orig/drivers/misc/tegra-profiler/comm.c kernel.21.3/drivers/misc/tegra-profiler/comm.c
--- kernel.21.3.orig/drivers/misc/tegra-profiler/comm.c	2015-02-03 01:44:29.000000000 +0000
+++ kernel.21.3/drivers/misc/tegra-profiler/comm.c	2015-04-03 10:17:32.000000000 +0000
@@ -267,10 +267,10 @@
 	if (!task)
 		return -EACCES;
 
-	if (current_fsuid() != task_uid(task) &&
-	    task_uid(task) != comm_ctx.debug_app_uid) {
+	if (!uid_eq(current_fsuid(), task_uid(task)) &&
+	    (__kuid_val(task_uid(task)) != comm_ctx.debug_app_uid)) {
 		pr_err("Permission denied, owner/task uids: %u/%u\n",
-			   current_fsuid(), task_uid(task));
+			   __kuid_val(current_fsuid()), __kuid_val(task_uid(task)));
 		return -EACCES;
 	}
 	return 0;
diff -Naur kernel.21.3.orig/drivers/misc/tegra-profiler/main.c kernel.21.3/drivers/misc/tegra-profiler/main.c
--- kernel.21.3.orig/drivers/misc/tegra-profiler/main.c	2015-02-03 01:44:29.000000000 +0000
+++ kernel.21.3/drivers/misc/tegra-profiler/main.c	2015-04-03 10:12:00.000000000 +0000
@@ -208,9 +208,9 @@
 		return -ESRCH;
 	}
 
-	pr_info("owner/task uids: %u/%u\n", current_fsuid(), task_uid(task));
+	pr_info("owner/task uids: %u/%u\n",__kuid_val(current_fsuid()), __kuid_val(task_uid(task)));
 	if (!capable(CAP_SYS_ADMIN)) {
-		if (current_fsuid() != task_uid(task)) {
+		if (!uid_eq(current_fsuid(), task_uid(task))) {
 			uid = quadd_auth_is_debuggable((char *)p->package_name);
 			if (uid < 0) {
 				pr_err("Error: QuadD security service\n");
diff -Naur kernel.21.3.orig/fs/proc/base.c kernel.21.3/fs/proc/base.c
--- kernel.21.3.orig/fs/proc/base.c	2015-02-03 01:44:32.000000000 +0000
+++ kernel.21.3/fs/proc/base.c	2015-04-03 09:48:38.000000000 +0000
@@ -1020,7 +1020,7 @@
 
 	p = get_proc_task(inode);
 	if(p) {
-		uid = task_uid(p);
+		uid = __kuid_val(task_uid(p));
 		put_task_struct(p);
 	}
 
@@ -1028,7 +1028,7 @@
 	 * System Server (uid == 1000) is granted access to oom_adj of all 
 	 * android applications (uid > 10000) as and services (uid >= 1000)
 	 */
-	if (p && (current_fsuid() == 1000) && (uid >= 1000)) {
+	if (p && (__kuid_val(current_fsuid()) == 1000) && (uid >= 1000)) {
 		if (inode->i_mode >> 6 & mask) {
 			return 0;
 		}
diff -Naur kernel.21.3.orig/kernel/sched/core.c kernel.21.3/kernel/sched/core.c
--- kernel.21.3.orig/kernel/sched/core.c	2015-02-03 01:44:33.000000000 +0000
+++ kernel.21.3/kernel/sched/core.c	2015-04-03 09:39:02.000000000 +0000
@@ -7808,7 +7808,7 @@
 		tcred = __task_cred(task);
 
 		if ((current != task) && !capable(CAP_SYS_NICE) &&
-		    cred->euid != tcred->uid && cred->euid != tcred->suid)
+		    !uid_eq(cred->euid, tcred->uid) && !uid_eq(cred->euid, tcred->suid))
 			return -EACCES;
 	}
 
diff -Naur kernel.21.3.orig/net/ipv4/tcp.c kernel.21.3/net/ipv4/tcp.c
--- kernel.21.3.orig/net/ipv4/tcp.c	2015-02-03 01:44:34.000000000 +0000
+++ kernel.21.3/net/ipv4/tcp.c	2015-04-03 10:32:59.000000000 +0000
@@ -1245,7 +1245,7 @@
 	release_sock(sk);
 
 	if (copied + copied_syn)
-		uid_stat_tcp_snd(current_uid(), copied + copied_syn);
+		uid_stat_tcp_snd(__kuid_val(current_uid()), copied + copied_syn);
 	return copied + copied_syn;
 
 do_fault:
@@ -1550,7 +1550,7 @@
 	if (copied > 0) {
 		tcp_recv_skb(sk, seq, &offset);
 		tcp_cleanup_rbuf(sk, copied);
-		uid_stat_tcp_rcv(current_uid(), copied);
+		uid_stat_tcp_rcv(__kuid_val(current_uid()), copied);
 	}
 	return copied;
 }
@@ -1957,7 +1957,7 @@
 	release_sock(sk);
 
 	if (copied > 0)
-		uid_stat_tcp_rcv(current_uid(), copied);
+		uid_stat_tcp_rcv(__kuid_val(current_uid()), copied);
 	return copied;
 
 out:
@@ -1967,7 +1967,7 @@
 recv_urg:
 	err = tcp_recv_urg(sk, msg, len, flags);
 	if (err > 0)
-		uid_stat_tcp_rcv(current_uid(), err);
+		uid_stat_tcp_rcv(__kuid_val(current_uid()), err);
 	goto out;
 
 recv_sndq:
diff -Naur kernel.21.3.orig/net/netfilter/xt_quota2.c kernel.21.3/net/netfilter/xt_quota2.c
--- kernel.21.3.orig/net/netfilter/xt_quota2.c	2015-02-03 01:44:34.000000000 +0000
+++ kernel.21.3/net/netfilter/xt_quota2.c	2015-04-03 10:50:05.000000000 +0000
@@ -231,7 +231,7 @@
 		spin_unlock_bh(&counter_list_lock);
 		goto out;
 	}
-	proc_set_user(p, quota_list_uid, quota_list_gid);
+	proc_set_user(p, make_kuid(&init_user_ns, quota_list_uid), make_kgid(&init_user_ns, quota_list_gid));
 	return e;
 
  out: