Merge with master
authorZach Anderson <zra@zra-intrepid.(none)>
Fri, 18 Sep 2009 01:49:55 +0000 (18:49 -0700)
committerZach Anderson <zra@zra-intrepid.(none)>
Fri, 18 Sep 2009 01:49:55 +0000 (18:49 -0700)
1  2 
kern/arch/i386/apic.c
kern/arch/i386/smp_boot.c
kern/src/init.c
kern/src/kmalloc.c
kern/src/manager.c
kern/src/monitor.c
kern/src/testing.c

Simple merge
Simple merge
diff --cc kern/src/init.c
  #include <manager.h>
  #include <testing.h>
  
+ #ifdef __i386__
+ #include <arch/rl8168.h>
+ #include <arch/ne2k.h>
+ #include <arch/mptables.h>
+ #include <arch/pci.h>
+ #include <arch/ioapic.h>
+ #endif
  void kernel_init(multiboot_info_t *mboot_info)
  {
 -      extern char (BND(__this, end) edata)[], (SNT end)[];
 +      extern char (RO BND(__this, end) edata)[], (RO SNT end)[];
  
        // Before doing anything else, complete the ELF loading process.
        // Clear the uninitialized global data (BSS) section of our program.
@@@ -127,15 -121,11 +127,16 @@@ void* kmalloc(size_t size, int flags
        //Otherwise go ahead and allocate them to ourselves now
        for(int i=0; i<npages; i++) {
                page_t* page;
 +
                page_alloc_specific(&page, first+i);
-               page_incref(page);
+               // Kevin doesn't like this next line 
+               page_incref(page); 
                page->num_cons_links = npages-i;
 +
 +              spin_lock_irqsave(&pages_list_lock);
                LIST_INSERT_HEAD(&pages_list, page, page_link);
 +              spin_unlock_irqsave(&pages_list_lock);
 +
                kmallocdebug("mallocing page: %u\n", first+i);
                kmallocdebug("at addr: %p\n", ppn2kva(first+i));
        }
@@@ -29,7 -29,8 +29,8 @@@
   */
  void manager(void)
  {
 -      static uint8_t progress = 0;
 +      static uint8_t RACY progress = 0;
        struct proc *envs[256];
        struct proc *p ;
  
Simple merge
Simple merge