commit a775965b6c58b67f3d26a854a835db27c3244e0d
author Nick Pelly <npelly@google.com> Fri Oct 15 10:56:17 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 15 10:56:17 2010 -0700
tree 99eedbe56d1e6c6341607b70bd5b80fde4f3dd03
parent 89aff1d22662c64cc2de384e7e2c699e4d1d5d47
parent 85905a6ab4d970f04d421bd2077ba4ad6fe67c3e

Merge "Add AID_NFC for use by the NFC service." into gingerbread

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index ebac7f5..5bed00c 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -79,6 +79,8 @@
 #define VENDOR_ID_SK_TELESYS    0x1F53
 // KT Tech's USB Vendor ID
 #define VENDOR_ID_KT_TECH       0x2116
+// Asus's USB Vendor ID
+#define VENDOR_ID_ASUS          0x0b05
 
 
 /** built-in vendor list */
@@ -105,6 +107,7 @@
     VENDOR_ID_TOSHIBA,
     VENDOR_ID_SK_TELESYS,
     VENDOR_ID_KT_TECH,
+    VENDOR_ID_ASUS,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))

libpixelflinger/codeflinger/CodeCache.cpp

diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp
index 5877ff4..125c3ce 100644
--- a/libpixelflinger/codeflinger/CodeCache.cpp
+++ b/libpixelflinger/codeflinger/CodeCache.cpp
@@ -94,7 +94,7 @@
     long pagemask = ~(pagesize - 1);  // assumes pagesize is a power of 2
 
     uint32_t* pageStart = (uint32_t*) (((uintptr_t) mBase) & pagemask);
-    size_t adjustedLength = mBase - pageStart + mSize;
+    size_t adjustedLength = (mBase - pageStart) * sizeof(uint32_t) + mSize;
 
     if (mBase && mprotect(pageStart, adjustedLength, PROT_READ | PROT_WRITE | PROT_EXEC) != 0) {
         mspace_free(getMspace(), mBase);