From 6a3d68af9ce6665e7cffa3f668b77cdda4e10fc7 Mon Sep 17 00:00:00 2001
From: John Stultz <jstultz@google.com>
Date: Tue, 2 Apr 2024 14:36:57 -0700
Subject: [PATCH] ANDROID: Zap kernel/sched/android.h stubs

Long ago with android-mainline, kernel/sched/android.h was added
to include stub functions for out-of-tree logic that we wanted
to remove from android-mainline without breaking vendor drivers
that relied on these stubs.

Unfortunately, when the android release branches (android14-6.1
and android15-6.6) forked from android-mainline, the stubs were
kept.

In some cases, the functionality dropped was re-added to the
release branches, but using new function names. Drivers that
continued to use the old names, would then end up using the stub
impelementations, likely without noticing.

Lets try to clean this up by removing the stub header.

This should not affect the GKI KABI, and pre-existing modules
should continue to work, but when modules are re-build, they
may run into build issues and will need tweaks to remove the
old stub functions.

Bug: 332588830
Change-Id: I516913f2e4c36e6edbffb3c12b633a158ba04287
Signed-off-by: John Stultz <jstultz@google.com>
---
 kernel/sched/android.h | 27 ---------------------------
 kernel/sched/sched.h   |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 kernel/sched/android.h

diff --git a/kernel/sched/android.h b/kernel/sched/android.h
deleted file mode 100644
index 5fe6bb772368..000000000000
--- a/kernel/sched/android.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Android scheduler hooks and modifications
- *
- * Put all of the android-specific scheduler hooks and changes
- * in this .h file to make merges and modifications easier.  It's also
- * simpler to notice what is, and is not, an upstream change this way over time.
- */
-
-
-/*
- * task_may_not_preempt - check whether a task may not be preemptible soon
- */
-static inline bool task_may_not_preempt(struct task_struct *task, int cpu)
-{
-	return false;
-}
-
-static inline bool uclamp_boosted(struct task_struct *p)
-{
-	return false;
-}
-
-static inline bool uclamp_latency_sensitive(struct task_struct *p)
-{
-	return false;
-}
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index f3ee288cc680..8ccf52d0bf2b 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -70,7 +70,6 @@
 #include <linux/workqueue_api.h>
 #include <linux/android_vendor.h>
 #include <linux/android_kabi.h>
-#include "android.h"
 
 #include <trace/events/power.h>
 #include <trace/events/sched.h>