Skip to content

x86: segmentation.h: fix C++ build error #1417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2017
Merged

x86: segmentation.h: fix C++ build error #1417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/arch/x86/segmentation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,8 @@ static inline void _init_irq_gate(struct segment_descriptor *sd,
static inline void _far_jump(u16_t sel, void *offset)
{
struct far_ptr ptr = {
.sel = sel,
.offset = offset
.offset = offset,
.sel = sel
};

__asm__ __volatile__ ("ljmp *%0" :: "m" (ptr));
Expand All @@ -454,8 +454,8 @@ static inline void _far_jump(u16_t sel, void *offset)
static inline void _far_call(u16_t sel, void *offset)
{
struct far_ptr ptr = {
.sel = sel,
.offset = offset
.offset = offset,
.sel = sel
};

__asm__ __volatile__ ("lcall *%0" :: "m" (ptr));
Expand Down