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
nexedi
linux
Commits
5236eb96
Commit
5236eb96
authored
Jun 24, 2013
by
H. Peter Anvin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace
Fix from Steven Rostedt.
parents
33e5ff63
2b4bc789
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
arch/x86/include/asm/desc.h
arch/x86/include/asm/desc.h
+4
-6
arch/x86/kernel/tracepoint.c
arch/x86/kernel/tracepoint.c
+4
-0
No files found.
arch/x86/include/asm/desc.h
View file @
5236eb96
...
...
@@ -497,21 +497,19 @@ static inline void load_trace_idt(void)
#endif
/*
*
the load_current_idt() is called with interrupt disabled by local_irq_save()
*
The load_current_idt() must be called with interrupts disabled
* to avoid races. That way the IDT will always be set back to the expected
* descriptor.
* descriptor. It's also called when a CPU is being initialized, and
* that doesn't need to disable interrupts, as nothing should be
* bothering the CPU then.
*/
static
inline
void
load_current_idt
(
void
)
{
unsigned
long
flags
;
local_irq_save
(
flags
);
if
(
is_debug_idt_enabled
())
load_debug_idt
();
else
if
(
is_trace_idt_enabled
())
load_trace_idt
();
else
load_idt
((
const
struct
desc_ptr
*
)
&
idt_descr
);
local_irq_restore
(
flags
);
}
#endif
/* _ASM_X86_DESC_H */
arch/x86/kernel/tracepoint.c
View file @
5236eb96
...
...
@@ -29,7 +29,11 @@ static void set_trace_idt_ctr(int val)
static
void
switch_idt
(
void
*
arg
)
{
unsigned
long
flags
;
local_irq_save
(
flags
);
load_current_idt
();
local_irq_restore
(
flags
);
}
void
trace_irq_vector_regfunc
(
void
)
...
...
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