Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
19c5787a
Commit
19c5787a
authored
Nov 06, 2017
by
Ingo Molnar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'x86/fpu' into x86/asm, to pick up fix
Signed-off-by:
Ingo Molnar
<
mingo@kernel.org
>
parents
1e4c4f61
1943dc07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
41 deletions
+11
-41
arch/x86/kernel/cpu/cpuid-deps.c
arch/x86/kernel/cpu/cpuid-deps.c
+11
-15
include/linux/bitops.h
include/linux/bitops.h
+0
-26
No files found.
arch/x86/kernel/cpu/cpuid-deps.c
View file @
19c5787a
...
@@ -62,23 +62,19 @@ const static struct cpuid_dep cpuid_deps[] = {
...
@@ -62,23 +62,19 @@ const static struct cpuid_dep cpuid_deps[] = {
{}
{}
};
};
static
inline
void
__clear_cpu_cap
(
struct
cpuinfo_x86
*
c
,
unsigned
int
bit
)
{
clear_bit32
(
bit
,
c
->
x86_capability
);
}
static
inline
void
__setup_clear_cpu_cap
(
unsigned
int
bit
)
{
clear_cpu_cap
(
&
boot_cpu_data
,
bit
);
set_bit32
(
bit
,
cpu_caps_cleared
);
}
static
inline
void
clear_feature
(
struct
cpuinfo_x86
*
c
,
unsigned
int
feature
)
static
inline
void
clear_feature
(
struct
cpuinfo_x86
*
c
,
unsigned
int
feature
)
{
{
if
(
!
c
)
/*
__setup_clear_cpu_cap
(
feature
);
* Note: This could use the non atomic __*_bit() variants, but the
else
* rest of the cpufeature code uses atomics as well, so keep it for
__clear_cpu_cap
(
c
,
feature
);
* consistency. Cleanup all of it separately.
*/
if
(
!
c
)
{
clear_cpu_cap
(
&
boot_cpu_data
,
feature
);
set_bit
(
feature
,
(
unsigned
long
*
)
cpu_caps_cleared
);
}
else
{
clear_bit
(
feature
,
(
unsigned
long
*
)
c
->
x86_capability
);
}
}
}
/* Take the capabilities and the BUG bits into account */
/* Take the capabilities and the BUG bits into account */
...
...
include/linux/bitops.h
View file @
19c5787a
...
@@ -227,32 +227,6 @@ static inline unsigned long __ffs64(u64 word)
...
@@ -227,32 +227,6 @@ static inline unsigned long __ffs64(u64 word)
return
__ffs
((
unsigned
long
)
word
);
return
__ffs
((
unsigned
long
)
word
);
}
}
/*
* clear_bit32 - Clear a bit in memory for u32 array
* @nr: Bit to clear
* @addr: u32 * address of bitmap
*
* Same as clear_bit, but avoids needing casts for u32 arrays.
*/
static
__always_inline
void
clear_bit32
(
long
nr
,
volatile
u32
*
addr
)
{
clear_bit
(
nr
,
(
volatile
unsigned
long
*
)
addr
);
}
/*
* set_bit32 - Set a bit in memory for u32 array
* @nr: Bit to clear
* @addr: u32 * address of bitmap
*
* Same as set_bit, but avoids needing casts for u32 arrays.
*/
static
__always_inline
void
set_bit32
(
long
nr
,
volatile
u32
*
addr
)
{
set_bit
(
nr
,
(
volatile
unsigned
long
*
)
addr
);
}
#ifdef __KERNEL__
#ifdef __KERNEL__
#ifndef set_mask_bits
#ifndef set_mask_bits
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment