Changeset 4c53333 in mainline for kernel/genarch/include

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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

Location:

kernel/genarch/include/genarch

Files:

• acpi/acpi.h (moved) (moved from kernel/genarch/include/acpi/acpi.h )
• acpi/madt.h (moved) (moved from kernel/genarch/include/acpi/madt.h )
• drivers/am335x/cm_dpll.h (added)
• drivers/am335x/cm_dpll_regs.h (added)
• drivers/am335x/cm_per.h (added)
• drivers/am335x/cm_per_regs.h (added)
• drivers/am335x/ctrl_module.h (added)
• drivers/am335x/ctrl_module_regs.h (added)
• drivers/am335x/iomux.h (added)
• drivers/am335x/irc.h (added)
• drivers/am335x/timer.h (added)
• drivers/am335x/timer_regs.h (added)
• drivers/am335x/uart.h (added)
• drivers/amdm37x/gpt.h (added)
• drivers/amdm37x/irc.h (added)
• drivers/amdm37x/uart.h (added)
• drivers/arm926_uart/arm926_uart.h (added)
• drivers/dsrln/dsrlnin.h (moved) (moved from kernel/genarch/include/drivers/dsrln/dsrlnin.h )
• drivers/dsrln/dsrlnout.h (moved) (moved from kernel/genarch/include/drivers/dsrln/dsrlnout.h )
• drivers/ega/ega.h (moved) (moved from kernel/genarch/include/drivers/ega/ega.h )
• drivers/i8042/i8042.h (moved) (moved from kernel/genarch/include/drivers/i8042/i8042.h )
• drivers/legacy/ia32/io.h (moved) (moved from kernel/genarch/include/drivers/legacy/ia32/io.h )
• drivers/ns16550/ns16550.h (moved) (moved from kernel/genarch/include/drivers/ns16550/ns16550.h )
• drivers/omap/uart.h (added)
• drivers/omap/uart_regs.h (added)
• drivers/pl050/pl050.h (moved) (moved from kernel/genarch/include/drivers/pl050/pl050.h )
• drivers/s3c24xx_irqc/s3c24xx_irqc.h (moved) (moved from kernel/genarch/include/drivers/s3c24xx_irqc/s3c24xx_irqc.h )
• drivers/s3c24xx_timer/s3c24xx_timer.h (moved) (moved from kernel/genarch/include/drivers/s3c24xx_timer/s3c24xx_timer.h )
• drivers/s3c24xx_uart/s3c24xx_uart.h (moved) (moved from kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h )
• drivers/via-cuda/cuda.h (moved) (moved from kernel/genarch/include/drivers/via-cuda/cuda.h )
• fb/bfb.h (moved) (moved from kernel/genarch/include/fb/bfb.h )
• fb/fb.h (moved) (moved from kernel/genarch/include/fb/fb.h )
• fb/font-8x16.h (moved) (moved from kernel/genarch/include/fb/font-8x16.h )
• fb/logo-196x66.h (moved) (moved from kernel/genarch/include/fb/logo-196x66.h )
• kbrd/kbrd.h (moved) (moved from kernel/genarch/include/kbrd/kbrd.h )
• kbrd/scanc.h (moved) (moved from kernel/genarch/include/kbrd/scanc.h )
• kbrd/scanc_mac.h (moved) (moved from kernel/genarch/include/kbrd/scanc_mac.h )
• kbrd/scanc_pc.h (moved) (moved from kernel/genarch/include/kbrd/scanc_pc.h )
• kbrd/scanc_pl050.h (moved) (moved from kernel/genarch/include/kbrd/scanc_pl050.h )
• kbrd/scanc_sun.h (moved) (moved from kernel/genarch/include/kbrd/scanc_sun.h )
• mm/as_ht.h (moved) (moved from kernel/genarch/include/mm/as_ht.h )
• mm/as_pt.h (moved) (moved from kernel/genarch/include/mm/as_pt.h )
• mm/asid_fifo.h (moved) (moved from kernel/genarch/include/mm/asid_fifo.h )
• mm/page_ht.h (moved) (moved from kernel/genarch/include/mm/page_ht.h )
• mm/page_pt.h (moved) (moved from kernel/genarch/include/mm/page_pt.h ) (1 diff)
• multiboot/multiboot.h (moved) (moved from kernel/genarch/include/multiboot/multiboot.h ) (1 diff)
• multiboot/multiboot2.h (moved) (moved from kernel/genarch/include/multiboot/multiboot2.h )
• ofw/ebus.h (moved) (moved from kernel/genarch/include/ofw/ebus.h )
• ofw/ofw_tree.h (moved) (moved from kernel/genarch/include/ofw/ofw_tree.h )
• ofw/pci.h (moved) (moved from kernel/genarch/include/ofw/pci.h )
• ofw/sbus.h (moved) (moved from kernel/genarch/include/ofw/sbus.h )
• ofw/upa.h (moved) (moved from kernel/genarch/include/ofw/upa.h )
• softint/division.h (moved) (moved from kernel/genarch/include/softint/division.h )
• softint/multiplication.h (moved) (moved from kernel/genarch/include/softint/multiplication.h )
• srln/srln.h (moved) (moved from kernel/genarch/include/srln/srln.h )

kernel/genarch/include/genarch/mm/page_pt.h

@@ -115 +115 @@
 
 /*
+ * These macros are provided to set the present bit within the page tables.
+ *
+ */
+#define SET_PTL1_PRESENT(ptl0, i)   SET_PTL1_PRESENT_ARCH(ptl0, i)
+#define SET_PTL2_PRESENT(ptl1, i)   SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT(ptl2, i)   SET_PTL3_PRESENT_ARCH(ptl2, i)
+#define SET_FRAME_PRESENT(ptl3, i)  SET_FRAME_PRESENT_ARCH(ptl3, i)
+
+/*
  * Macros for querying the last-level PTEs.
  *

kernel/genarch/include/genarch/multiboot/multiboot.h

@@ -99 +99 @@
 
 extern void multiboot_extract_command(char *, size_t, const char *);
+extern void multiboot_extract_argument(char *, size_t, const char *);
 extern void multiboot_info_parse(uint32_t, const multiboot_info_t *);