Revert "6.7/6.8: misc-additions: Add ptr1337's GPL condom for Nvidia modules"
This reverts commit 07d4c29330ffb701c36a2edfdd7c8f326f0bfe1f.
This commit is contained in:
parent
07d4c29330
commit
425ac0f897
@ -97,40 +97,3 @@ index f4b210ab061291..837d0dbb28ea08 100644
|
|||||||
depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS
|
depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS
|
||||||
help
|
help
|
||||||
This value can be used to select the number of bits to use to
|
This value can be used to select the number of bits to use to
|
||||||
|
|
||||||
From 44154371304cc8d068dd33c5dec4057926c364af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Jung <admin@ptr1337.dev>
|
|
||||||
Date: Mon, 22 Jan 2024 18:26:56 +0100
|
|
||||||
Subject: [PATCH] Workaround to fix issues when compiling the nvidia driver
|
|
||||||
|
|
||||||
Signed-off-by: Peter Jung <admin@ptr1337.dev>
|
|
||||||
---
|
|
||||||
kernel/rcu/tree_plugin.h | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
|
|
||||||
index cc130b57542a..1d85cb7071cb 100644
|
|
||||||
--- a/arch/x86/kernel/alternative.c
|
|
||||||
+++ b/arch/x86/kernel/alternative.c
|
|
||||||
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
|
|
||||||
index 41021080ad25..72474d8ec180 100644
|
|
||||||
--- a/kernel/rcu/tree_plugin.h
|
|
||||||
+++ b/kernel/rcu/tree_plugin.h
|
|
||||||
@@ -406,7 +406,7 @@ void __rcu_read_lock(void)
|
|
||||||
WRITE_ONCE(current->rcu_read_unlock_special.b.need_qs, true);
|
|
||||||
barrier(); /* critical section after entry code. */
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(__rcu_read_lock);
|
|
||||||
+EXPORT_SYMBOL(__rcu_read_lock);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Preemptible RCU implementation for rcu_read_unlock().
|
|
||||||
@@ -431,7 +431,7 @@ void __rcu_read_unlock(void)
|
|
||||||
WARN_ON_ONCE(rrln < 0 || rrln > RCU_NEST_PMAX);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(__rcu_read_unlock);
|
|
||||||
+EXPORT_SYMBOL(__rcu_read_unlock);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Advance a ->blkd_tasks-list pointer to the next entry, instead
|
|
||||||
|
@ -98,35 +98,3 @@ index f4b210ab061291..837d0dbb28ea08 100644
|
|||||||
help
|
help
|
||||||
This value can be used to select the number of bits to use to
|
This value can be used to select the number of bits to use to
|
||||||
|
|
||||||
From 44154371304cc8d068dd33c5dec4057926c364af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Jung <admin@ptr1337.dev>
|
|
||||||
Date: Mon, 22 Jan 2024 18:26:56 +0100
|
|
||||||
Subject: [PATCH] Workaround to fix issues when compiling the nvidia driver
|
|
||||||
|
|
||||||
Signed-off-by: Peter Jung <admin@ptr1337.dev>
|
|
||||||
---
|
|
||||||
kernel/rcu/tree_plugin.h | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
|
|
||||||
index 41021080ad25..72474d8ec180 100644
|
|
||||||
--- a/kernel/rcu/tree_plugin.h
|
|
||||||
+++ b/kernel/rcu/tree_plugin.h
|
|
||||||
@@ -406,7 +406,7 @@ void __rcu_read_lock(void)
|
|
||||||
WRITE_ONCE(current->rcu_read_unlock_special.b.need_qs, true);
|
|
||||||
barrier(); /* critical section after entry code. */
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(__rcu_read_lock);
|
|
||||||
+EXPORT_SYMBOL(__rcu_read_lock);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Preemptible RCU implementation for rcu_read_unlock().
|
|
||||||
@@ -431,7 +431,7 @@ void __rcu_read_unlock(void)
|
|
||||||
WARN_ON_ONCE(rrln < 0 || rrln > RCU_NEST_PMAX);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(__rcu_read_unlock);
|
|
||||||
+EXPORT_SYMBOL(__rcu_read_unlock);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Advance a ->blkd_tasks-list pointer to the next entry, instead
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user