asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: fix BIT() redefinition

Browse source 
Commit fea30ad1bd ("ANDROID: preserve CRC for some DRM functions")
caused the BIT() macro to be redefined because vdso/bits.h is included
through vdso/datapage.h in some other files.

Move the __GENKSYMS__ BIT() check to vdso/bits.h in order to fix this.

Fixes: fea30ad1bd ("ANDROID: preserve CRC for some DRM functions")
Change-Id: I767d75e7e40b5acfa9b66754c7b2b74879a28de5
Signed-off-by: Michael Bestas <mkbestas@lineageos.org>
This commit is contained in:
Michael Bestas 2022-12-16 23:55:59 +02:00
parent 6369256a83
commit 838312a5a2
No known key found for this signature in database
GPG key ID: CC95044519BE6669
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/linux/bits.h
View file

@ -3,8 +3,8 @@
#define __LINUX_BITS_H
#include <linux/const.h>
#ifdef __GENKSYMS__
#include <vdso/bits.h>
#ifdef __GENKSYMS__
/*
* Old version of this macro to preserve the CRC signatures of some drm symbols.
* Crazy but true...
@ -14,7 +14,6 @@
#else
#include <asm/bitsperlong.h>
#define BIT(nr) (UL(1) << (nr))
#define BIT_ULL(nr) (ULL(1) << (nr))
#define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG))
#endif

10
include/vdso/bits.h
View file

@ -2,6 +2,16 @@
#ifndef __VDSO_BITS_H
#define __VDSO_BITS_H
#ifdef __GENKSYMS__
/*
* Old version of this macro to preserve the CRC signatures of some drm symbols.
* Crazy but true...
*/
#define BIT(nr) (1UL << (nr))
#else
#include <vdso/const.h>
#define BIT(nr) (UL(1) << (nr))
#endif
#endif /* __VDSO_BITS_H */