• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · d145c725
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)
      lguest: use __PAGE_KERNEL instead of _PAGE_KERNEL
      lguest: Use explicit includes rateher than indirect
      lguest: get rid of lg variable assignments
      lguest: change gpte_addr header
      lguest: move changed bitmap to lg_cpu
      lguest: move last_pages to lg_cpu
      lguest: change last_guest to last_cpu
      lguest: change spte_addr header
      lguest: per-vcpu lguest pgdir management
      lguest: make pending notifications per-vcpu
      lguest: makes special fields be per-vcpu
      lguest: per-vcpu lguest task management
      lguest: replace lguest_arch with lg_cpu_arch.
      lguest: make registers per-vcpu
      lguest: make emulate_insn receive a vcpu struct.
      lguest: map_switcher_in_guest() per-vcpu
      lguest: per-vcpu interrupt processing.
      lguest: per-vcpu lguest timers
      lguest: make hypercalls use the vcpu struct
      lguest: make write() operation smp aware
      ...
    
    Manual conflict resolved (maybe even correctly, who knows) in
    drivers/lguest/x86/core.c
    d145c725
core.c 21.6 KB