Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
K
kernel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
kernel
Commits
b90233bc
Commit
b90233bc
authored
4 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Plain Diff
Merge branch 'paging-repr-packed' into 'master'
Use #[repr(packed)] with correct alignment for paging. See merge request
!124
parents
93e0db1a
c7b207f4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!124
Use #[repr(packed)] with correct alignment for paging.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/arch/x86_64/paging/entry.rs
+1
-0
1 addition, 0 deletions
src/arch/x86_64/paging/entry.rs
src/arch/x86_64/paging/table.rs
+1
-0
1 addition, 0 deletions
src/arch/x86_64/paging/table.rs
with
2 additions
and
0 deletions
src/arch/x86_64/paging/entry.rs
+
1
−
0
View file @
b90233bc
...
...
@@ -6,6 +6,7 @@ use crate::memory::Frame;
use
super
::
PhysicalAddress
;
/// A page table entry
#[repr(packed(
8
))]
pub
struct
Entry
(
u64
);
bitflags!
{
...
...
This diff is collapsed.
Click to expand it.
src/arch/x86_64/paging/table.rs
+
1
−
0
View file @
b90233bc
...
...
@@ -39,6 +39,7 @@ impl HierarchicalLevel for Level2 {
type
NextLevel
=
Level1
;
}
#[repr(packed(
4096
))]
pub
struct
Table
<
L
:
TableLevel
>
{
entries
:
[
Entry
;
ENTRY_COUNT
],
level
:
PhantomData
<
L
>
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment