The patch titled
drm-build-fixes-2
has been added to the -mm tree. Its filename is
drm-build-fixes-2.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drm-build-fixes-2
From: Andrew Morton <akpm@xxxxxxxx>
TRUE and FALSE are about the most dangerous symbols you can (attempt to) use
in portable code.
Cc: Dave Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/drm/drm_mm.c | 14 +++++++-------
drivers/char/drm/drm_sman.c | 2 +-
drivers/char/drm/sis_mm.c | 12 ++++++------
drivers/char/drm/via_mm.c | 10 +++++-----
4 files changed, 19 insertions(+), 19 deletions(-)
diff -puN drivers/char/drm/drm_sman.c~drm-build-fixes-2 drivers/char/drm/drm_sman.c
--- a/drivers/char/drm/drm_sman.c~drm-build-fixes-2
+++ a/drivers/char/drm/drm_sman.c
@@ -91,7 +91,7 @@ static void *drm_sman_mm_allocate(void *
drm_mm_t *mm = (drm_mm_t *) private;
drm_mm_node_t *tmp;
- tmp = drm_mm_search_free(mm, size, alignment, TRUE);
+ tmp = drm_mm_search_free(mm, size, alignment, 1);
if (!tmp) {
return NULL;
}
diff -puN drivers/char/drm/drm_mm.c~drm-build-fixes-2 drivers/char/drm/drm_mm.c
--- a/drivers/char/drm/drm_mm.c~drm-build-fixes-2
+++ a/drivers/char/drm/drm_mm.c
@@ -54,7 +54,7 @@ drm_mm_node_t *drm_mm_get_block(drm_mm_n
if (parent->size == size) {
list_del_init(&parent->fl_entry);
- parent->free = FALSE;
+ parent->free = 0;
return parent;
} else {
child = (drm_mm_node_t *) drm_alloc(sizeof(*child), DRM_MEM_MM);
@@ -64,7 +64,7 @@ drm_mm_node_t *drm_mm_get_block(drm_mm_n
INIT_LIST_HEAD(&child->ml_entry);
INIT_LIST_HEAD(&child->fl_entry);
- child->free = FALSE;
+ child->free = 0;
child->size = size;
child->start = parent->start;
@@ -89,13 +89,13 @@ void drm_mm_put_block(drm_mm_t * mm, drm
drm_mm_node_t *prev_node = NULL;
drm_mm_node_t *next_node;
- int merged = FALSE;
+ int merged = 0;
if (cur_head->prev != root_head) {
prev_node = list_entry(cur_head->prev, drm_mm_node_t, ml_entry);
if (prev_node->free) {
prev_node->size += cur->size;
- merged = TRUE;
+ merged = 1;
}
}
if (cur_head->next != root_head) {
@@ -110,12 +110,12 @@ void drm_mm_put_block(drm_mm_t * mm, drm
} else {
next_node->size += cur->size;
next_node->start = cur->start;
- merged = TRUE;
+ merged = 1;
}
}
}
if (!merged) {
- cur->free = TRUE;
+ cur->free = 1;
list_add(&cur->fl_entry, &list_root->fl_entry);
} else {
list_del(&cur->ml_entry);
@@ -169,7 +169,7 @@ int drm_mm_init(drm_mm_t * mm, unsigned
child->start = start;
child->size = size;
- child->free = TRUE;
+ child->free = 1;
list_add(&child->fl_entry, &mm->root_node.fl_entry);
list_add(&child->ml_entry, &mm->root_node.ml_entry);
diff -puN drivers/char/drm/sis_mm.c~drm-build-fixes-2 drivers/char/drm/sis_mm.c
--- a/drivers/char/drm/sis_mm.c~drm-build-fixes-2
+++ a/drivers/char/drm/sis_mm.c
@@ -111,7 +111,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS)
return ret;
}
- dev_priv->vram_initialized = TRUE;
+ dev_priv->vram_initialized = 1;
dev_priv->vram_offset = fb.offset;
mutex_unlock(&dev->struct_mutex);
@@ -133,7 +133,7 @@ static int sis_drm_alloc(drm_device_t *
mutex_lock(&dev->struct_mutex);
- if (FALSE == ((pool == 0) ? dev_priv->vram_initialized :
+ if (0 == ((pool == 0) ? dev_priv->vram_initialized :
dev_priv->agp_initialized)) {
DRM_ERROR
("Attempt to allocate from uninitialized memory manager.\n");
@@ -211,7 +211,7 @@ static int sis_ioctl_agp_init(DRM_IOCTL_
return ret;
}
- dev_priv->agp_initialized = TRUE;
+ dev_priv->agp_initialized = 1;
dev_priv->agp_offset = agp.offset;
mutex_unlock(&dev->struct_mutex);
@@ -284,7 +284,7 @@ int sis_idle(drm_device_t *dev)
if (time_after_eq(jiffies, end)) {
DRM_ERROR("Graphics engine idle timeout. "
"Disabling idle check\n");
- dev_priv->idle_fault = TRUE;
+ dev_priv->idle_fault = 1;
}
/*
@@ -305,8 +305,8 @@ void sis_lastclose(struct drm_device *de
mutex_lock(&dev->struct_mutex);
drm_sman_cleanup(&dev_priv->sman);
- dev_priv->vram_initialized = FALSE;
- dev_priv->agp_initialized = FALSE;
+ dev_priv->vram_initialized = 0;
+ dev_priv->agp_initialized = 0;
dev_priv->mmio = NULL;
mutex_unlock(&dev->struct_mutex);
}
diff -puN drivers/char/drm/via_mm.c~drm-build-fixes-2 drivers/char/drm/via_mm.c
--- a/drivers/char/drm/via_mm.c~drm-build-fixes-2
+++ a/drivers/char/drm/via_mm.c
@@ -52,7 +52,7 @@ int via_agp_init(DRM_IOCTL_ARGS)
return ret;
}
- dev_priv->agp_initialized = TRUE;
+ dev_priv->agp_initialized = 1;
dev_priv->agp_offset = agp.offset;
mutex_unlock(&dev->struct_mutex);
@@ -79,7 +79,7 @@ int via_fb_init(DRM_IOCTL_ARGS)
return ret;
}
- dev_priv->vram_initialized = TRUE;
+ dev_priv->vram_initialized = 1;
dev_priv->vram_offset = fb.offset;
mutex_unlock(&dev->struct_mutex);
@@ -116,8 +116,8 @@ void via_lastclose(struct drm_device *de
mutex_lock(&dev->struct_mutex);
drm_sman_cleanup(&dev_priv->sman);
- dev_priv->vram_initialized = FALSE;
- dev_priv->agp_initialized = FALSE;
+ dev_priv->vram_initialized = 0;
+ dev_priv->agp_initialized = 0;
mutex_unlock(&dev->struct_mutex);
}
@@ -139,7 +139,7 @@ int via_mem_alloc(DRM_IOCTL_ARGS)
return DRM_ERR(EINVAL);
}
mutex_lock(&dev->struct_mutex);
- if (FALSE == ((mem.type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
+ if (0 == ((mem.type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
dev_priv->agp_initialized)) {
DRM_ERROR
("Attempt to allocate from uninitialized memory manager.\n");
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
add-force-of-use-mmconfig.patch
add-efi-e820-memory-mapping-on-x86.patch
adfs-error-message-fix.patch
fix-x86_64-mm-allow-users-to-force-a-panic-on-nmi.patch
workqueue-remove-lock_cpu_hotplug.patch
fuse-fix-error-case-in-fuse_readpages-kernel-doc-fix.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
kauditd_thread-warning-fix.patch
revert-gregkh-driver-class_device_rename-remove.patch
revert-gregkh-driver-network-class_device-to-device.patch
revert-gregkh-driver-tty-device.patch
revert-gregkh-driver-mem-devices.patch
add-__must_check-to-device-management-code.patch
add-config_enable_must_check.patch
v4l-dev2-handle-__must_check.patch
drivers-base-check-errors.patch
drivers-base-check-errors-fix.patch
sysfs-add-proper-sysfs_init-prototype.patch
scsi-device_reprobe-can-fail.patch
drm-build-fix.patch
drm-build-fixes-2.patch
git-drm-build-fix.patch
git-dvb.patch
git-gfs2.patch
git-ia64.patch
git-ieee1394-fixup.patch
git-input.patch
git-kbuild.patch
git-libata-all.patch
asus-mv-device-ids.patch
1-of-2-jmicron-driver-hard_port_no-fix.patch
piix_host_stop-leak-fix.patch
git-netdev-all.patch
82596-section-fixes.patch
ac3200-section-fixes.patch
cops-section-fix.patch
cs89x0-section-fix.patch
at1700-section-fix.patch
e2100-section-fix.patch
eepro-section-fix.patch
eexpress-section-fix.patch
es3210-section-fix.patch
eth16i-section-fix.patch
lance-section-fix.patch
lne390-section-fix.patch
ni52-section-fix.patch
ibmtr-section-fix.patch
smctr-section-fix.patch
wd-section-fix.patch
ni65-section-fix.patch
seeq8005-section-fix.patch
winbond-840-section-fix.patch
fealnx-section-fix.patch
sundance-section-fix.patch
e1000_7033_dump_ring-fix.patch
s2io-build-fix.patch
pal-support-of-the-fixed-phy-fix.patch
pal-support-of-the-fixed-phy-export.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
ppp-handle-kmalloc-failures-leak-fix.patch
ppp-handle-kmalloc-failures-leak-tweaks.patch
xt_physdev-build-fix.patch
git-nfs.patch
git-pcmcia-fixup.patch
git-powerpc.patch
git-sas.patch
git-block-vs-git-sas.patch
serial-fix-uart_bug_txen-test.patch
revert-gregkh-pci-pci-use-pci_bios-as-last-fallback.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
fix-panic-when-reinserting-adaptec-pcmcia-scsi-card-tidy.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
usb-hub-driver-improve-use-of-ifdef-fix.patch
pm-usb-hcds-use-pm_event_prethaw-fix.patch
rtl8150_disconnect-needs-tasklet_kill.patch
git-supertrak-fixup.patch
git-watchdog.patch
kthread-airoc-race-fix.patch
revert-x86_64-mm-i386-remove-lock-section.patch
revert-x86_64-mm-i386-semaphore-to-asm.patch
revert-x86_64-mm-detect-cfi.patch
x86_64-mm-module-locks-raw-spinlock-hack-hack-hack.patch
fix-x86_64-mm-stacktrace-cleanup-for-s390.patch
x86_64-wire-up-oops_enter-oops_exit.patch
x86_64-make-numa_emulation-__init.patch
git-cryptodev-s390-fixes.patch
git-geode-vs-git-cryptodev.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
convert-i386-numa-kva-space-to-bootmem-tidy.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-fix.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix.patch
out-of-memory-notifier-tidy.patch
mm-swap-write-failure-fixup-fix.patch
slab-optimize-kmalloc_node-the-same-way-as-kmalloc-fix.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
binfmt_elf-consistently-use-loff_t.patch
convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls-tidy.patch
x86-increase-max_mp_busses-on-default-arch.patch
i386-adds-smp_call_function_single-fix.patch
swsusp-write-timer.patch
swsusp-write-speedup.patch
swsusp-read-timer.patch
swsusp-read-speedup.patch
swsusp-read-speedup-fix.patch
swsusp-read-speedup-cleanup.patch
swsusp-read-speedup-cleanup-2.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private-gfs-fix.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
blockdevc-check-errors.patch
let-warn_on-warn_on_once-return-the-condition-fix.patch
let-warn_on-warn_on_once-return-the-condition-fix-2.patch
omap-add-watchdog-driver-support-tweaks.patch
move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch
single-bit-flip-detector-tidy.patch
fix-unserialized-task-files-changing-fix.patch
reiserfs-on-demand-bitmap-loading.patch
streamline-generic_file_-interfaces-and-filemap-gfs-fix.patch
add-vector-aio-support-fix.patch
csa-basic-accounting-over-taskstats-fix.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
isdn-work-around-excessive-udelay.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-tidy.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-fix.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch
knfsd-have-ext2-reject-file-handles-with-bad-inode-numbers-early-tidy.patch
knfsd-make-ext3-reject-filehandles-referring-to-invalid-inode-numbers-tidy.patch
knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch
knfsd-move-tempsock-aging-to-a-timer-tidy.patch
sched-remove-unnecessary-sched-group-allocations-fix.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-use-init_utsname-when-appropriate-gmidi.patch
namespaces-utsname-use-init_utsname-when-appropriate-print_kernel_version.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
ipc-namespace-core.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-rename-generic_sounding_globalspatch-fix.patch
hpt3xx-rework-rate-filtering-tidy.patch
asus-mv-ide-device-ids.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-msi-only-build-msi-apicc-on-ia64-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
srcu-report-out-of-memory-errors-fixlet.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
input_register_device-debug.patch
put_bh-debug.patch
jmicron-warning-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
