Sync to trunk head(r38096)

svn path=/branches/ros-amd64-bringup/; revision=38097

diff --cc reactos/config-amd64.template.rbuild
index 20d50aa,0000000..b8169d5
mode 100644,000000..100644
--- 1/reactos/config-amd64.template.rbuild
--- /dev/null
+++ b/reactos/config-amd64.template.rbuild
@@@ -1,86 -1,0 +1,86 @@@
- <property name="OPTIMIZE" value="3" />
 +<?xml version="1.0"?>
 +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">
 +<group>
 +
 +<!--
 +      This file is a template used as a starting point for compile-time
 +      configuration of ReactOS. Make a copy of this file and name it config.rbuild.
 +      Then change the options in config.rbuild. If you don't have a config.rbuild file,
 +      then the defaults in this file, config.template.rbuild, will be used instead.
 +
 +      Boolean options can obtain the values 0 (disabled) or 1 (enabled). String
 +      options can obtain any value specified in the comment before it.
 +-->
 +
 +
 +<!--
 +      Sub-architecture to build for. Specify one of:
 +-->
 +<property name="SARCH" value="" />
 +
 +
 +<!--
 +      Which CPU ReactOS should be optimized for. Specify one of:
 +              k8 opteron athlon64 athlon-fx
 +
 +      See GCC manual for more CPU names and which CPUs GCC can optimize for.
 +-->
 +<property name="OARCH" value="athlon64" />
 +
 +
 +<!--
 +      What level of optimisation to use.
 +              0 = off (will not work)
 +              1 = Default option, optimize for size (-Os) with some additional options
 +              2 = -Os
 +              3 = -O1
 +              4 = -O2
 +              5 = -O3
 +-->
++<property name="OPTIMIZE" value="1" />
 +
 +
 +<!--
 +      Whether to compile in the integrated kernel debugger.
 +-->
 +<property name="KDBG" value="0" />
 +
 +
 +<!--
 +      Whether to compile for debugging. No compiler optimizations will be
 +      performed.
 +-->
 +<property name="DBG" value="1" />
 +
 +
 +<!--
 +      Whether to compile for debugging with GDB. If you don't use GDB, don't
 +      enable this.
 +-->
 +<property name="GDB" value="0" />
 +
 +
 +<!--
 +      Whether to compile apps/libs with features covered software patents or not.
 +      If you live in a country where software patents are valid/apply, don't
 +      enable this (except they/you purchased a license from the patent owner).
 +      This settings is disabled (0) by default.
 +-->
 +<property name="NSWPAT" value="1" />
 +
 +<!--
 +      Whether to compile with the KD protocol. This will disable support for KDBG
 +      as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS.
 +      This is currently not fully working, and requires kdcom from Windows 2003 or
 +      TinyKRNL. Booting into debug mode with this flag enabled will result in a
 +      failure to enter GUI mode. Do not enable unless you know what you're doing.
 +-->
 +<property name="_WINKD_" value="1" />
 +
 +<!--
 +      Whether to compile support for ELF files. Do not enable unless you know what
 +      you're doing.
 +-->
 +<property name="_ELF_" value="0" />
 +
 +</group>

diff --cc reactos/dll/win32/advapi32/sec/misc.c
Simple merge

diff --cc reactos/drivers/storage/scsiport/scsiport.c
Simple merge

diff --cc reactos/include/ddk/ntimage.h
Simple merge

diff --cc reactos/include/ddk/winddk.h
Simple merge

diff --cc reactos/ntoskrnl/ex/sysinfo.c
index 5812b2b,e229008..748d303
--- 1/reactos/ntoskrnl/ex/sysinfo.c
--- 2/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@@@ -1954,4 -1955,4 +1962,4 @@@ NtGetCurrentProcessorNumber(VOID
      return KeGetCurrentProcessorNumber();
  }
  
--/* EOF */
++/* EOF */

diff --cc reactos/ntoskrnl/include/internal/ke.h
Simple merge

diff --cc reactos/ntoskrnl/mm/virtual.c
Simple merge