Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

triazo / kernel

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 3
  • Merge Requests 0
  • Wiki
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge request !7 opened Sep 28, 2015 by triazo@triazo 

Paging

Enables paging. I have yet to determine exactly how this affects the rest of the system.

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b paging origin/paging

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff paging

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 6
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • malcolm @malcolm commented Sep 28, 2015
    Master

    You should replace pragma with ifndef for compatibility. Flags for the page table should be named with #define s.

    You should replace pragma with ifndef for compatibility. Flags for the page table should be named with #define s.
  • triazo @triazo

    Added 3 commits:

    • 3e6dc6c2 - Remove C++ checks from kernel main file
    • 21818eb9 - Adds hex output to serial
    • 36eb51a1 - Give flags to the the paging structures
    Sep 28, 2015

    Added 3 commits:

    • 3e6dc6c2 - Remove C++ checks from kernel main file
    • 21818eb9 - Adds hex output to serial
    • 36eb51a1 - Give flags to the the paging structures
    Added 3 commits: * 3e6dc6c2 - Remove C++ checks from kernel main file * 21818eb9 - Adds hex output to serial * 36eb51a1 - Give flags to the the paging structures
    Toggle commit list
  • malcolm @malcolm commented Sep 29, 2015
    Master

    Looks good now, merging

    Looks good now, merging
  • malcolm @malcolm

    mentioned in commit 6f768eab

    Sep 29, 2015

    mentioned in commit 6f768eab

    mentioned in commit 6f768eabb396909418b195832a1561d01266ea30
    Toggle commit list
  • malcolm @malcolm

    Status changed to merged

    Sep 29, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: triazo/kernel!7