Changeset b0f00a9 in mainline for kernel/arch/ia64/include/mm/page.h


Ignore:
Timestamp:
2011-11-06T22:21:05Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/include/mm/page.h

    r2bdf8313 rb0f00a9  
    4141#define PAGE_SIZE   FRAME_SIZE
    4242#define PAGE_WIDTH  FRAME_WIDTH
    43 
    44 #ifdef KERNEL
    4543
    4644/** Bit width of the TLB-locked portion of kernel address space. */
    … …  
    316314#endif /* __ASM__ */
    317315
    318 #endif /* KERNEL */
    319 
    320316#endif
    321317
Note: See TracChangeset for help on using the changeset viewer.